Committed by
Gerrit Code Review
Use the same coding style in toString() implementations
Change-Id: I116eb140d92b385d36efe120c42cd2fb3efac760
Showing
82 changed files
with
370 additions
and
211 deletions
... | @@ -27,7 +27,6 @@ import org.slf4j.Logger; | ... | @@ -27,7 +27,6 @@ import org.slf4j.Logger; |
27 | import org.slf4j.LoggerFactory; | 27 | import org.slf4j.LoggerFactory; |
28 | 28 | ||
29 | import com.google.common.base.MoreObjects; | 29 | import com.google.common.base.MoreObjects; |
30 | -import com.google.common.base.MoreObjects.ToStringHelper; | ||
31 | 30 | ||
32 | /** | 31 | /** |
33 | * Provides PcInitiatedLspRequest for PCEP Initiate message. | 32 | * Provides PcInitiatedLspRequest for PCEP Initiate message. |
... | @@ -280,18 +279,13 @@ public class PcInitiatedLspRequestVer1 implements PcInitiatedLspRequest { | ... | @@ -280,18 +279,13 @@ public class PcInitiatedLspRequestVer1 implements PcInitiatedLspRequest { |
280 | 279 | ||
281 | @Override | 280 | @Override |
282 | public String toString() { | 281 | public String toString() { |
283 | - ToStringHelper toStrHelper = MoreObjects.toStringHelper(getClass()); | 282 | + return MoreObjects.toStringHelper(getClass()) |
284 | - toStrHelper.add("SrpObject", srpObject).add("LspObject", lspObject); | 283 | + .omitNullValues() |
285 | - | 284 | + .add("SrpObject", srpObject) |
286 | - if (endPointsObject != null) { | 285 | + .add("LspObject", lspObject) |
287 | - toStrHelper.add("EndPointObject", endPointsObject); | 286 | + .add("EndPointObject", endPointsObject) |
288 | - } | 287 | + .add("EroObject", eroObject) |
289 | - if (eroObject != null) { | 288 | + .add("PcepAttribute", pcepAttribute) |
290 | - toStrHelper.add("EroObject", eroObject); | 289 | + .toString(); |
291 | - } | ||
292 | - if (pcepAttribute != null) { | ||
293 | - toStrHelper.add("PcepAttribute", pcepAttribute); | ||
294 | - } | ||
295 | - return toStrHelper.toString(); | ||
296 | } | 290 | } |
297 | } | 291 | } | ... | ... |
... | @@ -31,7 +31,6 @@ import org.slf4j.Logger; | ... | @@ -31,7 +31,6 @@ import org.slf4j.Logger; |
31 | import org.slf4j.LoggerFactory; | 31 | import org.slf4j.LoggerFactory; |
32 | 32 | ||
33 | import com.google.common.base.MoreObjects; | 33 | import com.google.common.base.MoreObjects; |
34 | -import com.google.common.base.MoreObjects.ToStringHelper; | ||
35 | 34 | ||
36 | /** | 35 | /** |
37 | * Provides PCEP Attribute List. | 36 | * Provides PCEP Attribute List. |
... | @@ -421,20 +420,12 @@ public class PcepAttributeVer1 implements PcepAttribute { | ... | @@ -421,20 +420,12 @@ public class PcepAttributeVer1 implements PcepAttribute { |
421 | 420 | ||
422 | @Override | 421 | @Override |
423 | public String toString() { | 422 | public String toString() { |
424 | - ToStringHelper toStrHelper = MoreObjects.toStringHelper(getClass()); | 423 | + return MoreObjects.toStringHelper(getClass()) |
425 | - | 424 | + .omitNullValues() |
426 | - if (lspaObject != null) { | 425 | + .add("lspaObject", lspaObject) |
427 | - toStrHelper.add("lspaObject", lspaObject); | 426 | + .add("bandwidthObject", bandwidthObject) |
428 | - } | 427 | + .add("MetricObjectList", llMetricList) |
429 | - if (bandwidthObject != null) { | 428 | + .add("IroObject", iroObject) |
430 | - toStrHelper.add("bandwidthObject", bandwidthObject); | 429 | + .toString(); |
431 | - } | ||
432 | - if (llMetricList instanceof PcepMetricObject) { | ||
433 | - toStrHelper.add("MetricObjectList", llMetricList); | ||
434 | - } | ||
435 | - if (iroObject != null) { | ||
436 | - toStrHelper.add("IroObject", iroObject); | ||
437 | - } | ||
438 | - return toStrHelper.toString(); | ||
439 | } | 430 | } |
440 | } | 431 | } | ... | ... |
... | @@ -226,7 +226,8 @@ public class PcepBandwidthObjectVer1 implements PcepBandwidthObject { | ... | @@ -226,7 +226,8 @@ public class PcepBandwidthObjectVer1 implements PcepBandwidthObject { |
226 | 226 | ||
227 | @Override | 227 | @Override |
228 | public String toString() { | 228 | public String toString() { |
229 | - return MoreObjects.toStringHelper(getClass()).add("BandwidthObjectHeader", bandwidthObjHeader) | 229 | + return MoreObjects.toStringHelper(getClass()) |
230 | + .add("BandwidthObjectHeader", bandwidthObjHeader) | ||
230 | .add("Bandwidth", iBandwidth).toString(); | 231 | .add("Bandwidth", iBandwidth).toString(); |
231 | } | 232 | } |
232 | } | 233 | } | ... | ... |
... | @@ -344,7 +344,8 @@ class PcepCloseMsgVer1 implements PcepCloseMsg { | ... | @@ -344,7 +344,8 @@ class PcepCloseMsgVer1 implements PcepCloseMsg { |
344 | 344 | ||
345 | @Override | 345 | @Override |
346 | public String toString() { | 346 | public String toString() { |
347 | - return MoreObjects.toStringHelper(getClass()).add("closeObjectHeader", closeObjHeader).add("Reason", yReason) | 347 | + return MoreObjects.toStringHelper(getClass()) |
348 | + .add("closeObjectHeader", closeObjHeader).add("Reason", yReason) | ||
348 | .add("OptionalTlvlist", llOptionalTlv).toString(); | 349 | .add("OptionalTlvlist", llOptionalTlv).toString(); |
349 | } | 350 | } |
350 | } | 351 | } | ... | ... |
... | @@ -248,7 +248,8 @@ public class PcepEndPointsObjectVer1 implements PcepEndPointsObject { | ... | @@ -248,7 +248,8 @@ public class PcepEndPointsObjectVer1 implements PcepEndPointsObject { |
248 | 248 | ||
249 | @Override | 249 | @Override |
250 | public String toString() { | 250 | public String toString() { |
251 | - return MoreObjects.toStringHelper(getClass()).add("sourceIpAddress", sourceIpAddress) | 251 | + return MoreObjects.toStringHelper(getClass()) |
252 | + .add("sourceIpAddress", sourceIpAddress) | ||
252 | .add("destIpAddress", destIpAddress).toString(); | 253 | .add("destIpAddress", destIpAddress).toString(); |
253 | } | 254 | } |
254 | 255 | ... | ... |
... | @@ -400,7 +400,8 @@ public class PcepEroObjectVer1 implements PcepEroObject { | ... | @@ -400,7 +400,8 @@ public class PcepEroObjectVer1 implements PcepEroObject { |
400 | 400 | ||
401 | @Override | 401 | @Override |
402 | public String toString() { | 402 | public String toString() { |
403 | - return MoreObjects.toStringHelper(getClass()).add("EroObjHeader", eroObjHeader).add("SubObjects", llSubObjects) | 403 | + return MoreObjects.toStringHelper(getClass()) |
404 | + .add("EroObjHeader", eroObjHeader).add("SubObjects", llSubObjects) | ||
404 | .toString(); | 405 | .toString(); |
405 | } | 406 | } |
406 | } | 407 | } | ... | ... |
... | @@ -198,6 +198,7 @@ public class PcepErrorInfoVer1 implements PcepErrorInfo { | ... | @@ -198,6 +198,7 @@ public class PcepErrorInfoVer1 implements PcepErrorInfo { |
198 | 198 | ||
199 | @Override | 199 | @Override |
200 | public String toString() { | 200 | public String toString() { |
201 | - return MoreObjects.toStringHelper(getClass()).add("ErrorList", errList).toString(); | 201 | + return MoreObjects.toStringHelper(getClass()) |
202 | + .add("ErrorList", errList).toString(); | ||
202 | } | 203 | } |
203 | } | 204 | } | ... | ... |
... | @@ -319,7 +319,8 @@ public class PcepErrorObjectVer1 implements PcepErrorObject { | ... | @@ -319,7 +319,8 @@ public class PcepErrorObjectVer1 implements PcepErrorObject { |
319 | 319 | ||
320 | @Override | 320 | @Override |
321 | public String toString() { | 321 | public String toString() { |
322 | - return MoreObjects.toStringHelper(getClass()).add("ObjectHeader", errorObjHeader).add("ErrorType", yErrorType) | 322 | + return MoreObjects.toStringHelper(getClass()) |
323 | + .add("ObjectHeader", errorObjHeader).add("ErrorType", yErrorType) | ||
323 | .add("ErrorValue", yErrorValue).add("OptionalTlv", llOptionalTlv).toString(); | 324 | .add("ErrorValue", yErrorValue).add("OptionalTlv", llOptionalTlv).toString(); |
324 | } | 325 | } |
325 | } | 326 | } | ... | ... |
... | @@ -29,7 +29,6 @@ import org.slf4j.Logger; | ... | @@ -29,7 +29,6 @@ import org.slf4j.Logger; |
29 | import org.slf4j.LoggerFactory; | 29 | import org.slf4j.LoggerFactory; |
30 | 30 | ||
31 | import com.google.common.base.MoreObjects; | 31 | import com.google.common.base.MoreObjects; |
32 | -import com.google.common.base.MoreObjects.ToStringHelper; | ||
33 | 32 | ||
34 | /** | 33 | /** |
35 | * Provides PcepError list which contains RP or TE objects. | 34 | * Provides PcepError list which contains RP or TE objects. |
... | @@ -390,19 +389,11 @@ public class PcepErrorVer1 implements PcepError { | ... | @@ -390,19 +389,11 @@ public class PcepErrorVer1 implements PcepError { |
390 | 389 | ||
391 | @Override | 390 | @Override |
392 | public String toString() { | 391 | public String toString() { |
393 | - ToStringHelper toStrHelper = MoreObjects.toStringHelper(getClass()); | 392 | + return MoreObjects.toStringHelper(getClass()) |
394 | - | 393 | + .omitNullValues() |
395 | - //RP Object list is optional | 394 | + .add("RpObjectList", llRPObjList) |
396 | - if (llRPObjList != null) { | 395 | + .add("TeObjectList", llTEObjList) |
397 | - toStrHelper.add("RpObjectList", llRPObjList); | 396 | + .add("ErrorObjectList", llErrObjList) |
398 | - } | 397 | + .toString(); |
399 | - | ||
400 | - //TE Object list is optional | ||
401 | - if (llTEObjList != null) { | ||
402 | - toStrHelper.add("TeObjectList", llTEObjList); | ||
403 | - } | ||
404 | - | ||
405 | - //Error Object List is mandatory | ||
406 | - return toStrHelper.add("ErrorObjectList", llErrObjList).toString(); | ||
407 | } | 398 | } |
408 | } | 399 | } | ... | ... |
... | @@ -245,7 +245,9 @@ public class PcepFecObjectIPv4AdjacencyVer1 implements PcepFecObjectIPv4Adjacenc | ... | @@ -245,7 +245,9 @@ public class PcepFecObjectIPv4AdjacencyVer1 implements PcepFecObjectIPv4Adjacenc |
245 | 245 | ||
246 | @Override | 246 | @Override |
247 | public String toString() { | 247 | public String toString() { |
248 | - return MoreObjects.toStringHelper(getClass()).add("fecObjHeader", fecObjHeader) | 248 | + return MoreObjects.toStringHelper(getClass()) |
249 | - .add("localIPv4Address", localIPv4Address).add("remoteIPv4Address", remoteIPv4Address).toString(); | 249 | + .add("fecObjHeader", fecObjHeader) |
250 | + .add("localIPv4Address", localIPv4Address) | ||
251 | + .add("remoteIPv4Address", remoteIPv4Address).toString(); | ||
250 | } | 252 | } |
251 | } | 253 | } | ... | ... |
... | @@ -326,7 +326,8 @@ public class PcepFecObjectIPv4UnnumberedAdjacencyVer1 implements PcepFecObjectIP | ... | @@ -326,7 +326,8 @@ public class PcepFecObjectIPv4UnnumberedAdjacencyVer1 implements PcepFecObjectIP |
326 | 326 | ||
327 | @Override | 327 | @Override |
328 | public String toString() { | 328 | public String toString() { |
329 | - return MoreObjects.toStringHelper(getClass()).add("LocalNodeID: ", localNodeID) | 329 | + return MoreObjects.toStringHelper(getClass()) |
330 | + .add("LocalNodeID: ", localNodeID) | ||
330 | .add("LocalInterfaceID: ", localInterfaceID).add("RemoteNodeID: ", remoteNodeID) | 331 | .add("LocalInterfaceID: ", localInterfaceID).add("RemoteNodeID: ", remoteNodeID) |
331 | .add("RemoteInterfaceID: ", remoteInterfaceID).toString(); | 332 | .add("RemoteInterfaceID: ", remoteInterfaceID).toString(); |
332 | } | 333 | } | ... | ... |
... | @@ -209,7 +209,9 @@ public class PcepFecObjectIPv4Ver1 implements PcepFecObjectIPv4 { | ... | @@ -209,7 +209,9 @@ public class PcepFecObjectIPv4Ver1 implements PcepFecObjectIPv4 { |
209 | 209 | ||
210 | @Override | 210 | @Override |
211 | public String toString() { | 211 | public String toString() { |
212 | - return MoreObjects.toStringHelper(getClass()).add("fecObjHeader", fecObjHeader).add("nodeID: ", nodeID) | 212 | + return MoreObjects.toStringHelper(getClass()) |
213 | + .add("fecObjHeader", fecObjHeader) | ||
214 | + .add("nodeID: ", nodeID) | ||
213 | .toString(); | 215 | .toString(); |
214 | } | 216 | } |
215 | } | 217 | } | ... | ... |
... | @@ -241,7 +241,9 @@ public class PcepFecObjectIPv6AdjacencyVer1 implements PcepFecObjectIPv6Adjacenc | ... | @@ -241,7 +241,9 @@ public class PcepFecObjectIPv6AdjacencyVer1 implements PcepFecObjectIPv6Adjacenc |
241 | 241 | ||
242 | @Override | 242 | @Override |
243 | public String toString() { | 243 | public String toString() { |
244 | - return MoreObjects.toStringHelper(getClass()).add("localIPv6Address", localIPv6Address) | 244 | + return MoreObjects.toStringHelper(getClass()) |
245 | - .add("remoteIPv6Address: ", remoteIPv6Address).toString(); | 245 | + .add("localIPv6Address", localIPv6Address) |
246 | + .add("remoteIPv6Address: ", remoteIPv6Address) | ||
247 | + .toString(); | ||
246 | } | 248 | } |
247 | } | 249 | } | ... | ... |
... | @@ -212,7 +212,9 @@ public class PcepFecObjectIPv6Ver1 implements PcepFecObjectIPv6 { | ... | @@ -212,7 +212,9 @@ public class PcepFecObjectIPv6Ver1 implements PcepFecObjectIPv6 { |
212 | 212 | ||
213 | @Override | 213 | @Override |
214 | public String toString() { | 214 | public String toString() { |
215 | - return MoreObjects.toStringHelper(getClass()).add("fecObjHeader", fecObjHeader).add("NodeID: ", nodeID) | 215 | + return MoreObjects.toStringHelper(getClass()) |
216 | + .add("fecObjHeader", fecObjHeader) | ||
217 | + .add("NodeID: ", nodeID) | ||
216 | .toString(); | 218 | .toString(); |
217 | } | 219 | } |
218 | } | 220 | } | ... | ... |
... | @@ -325,7 +325,8 @@ class PcepInitiateMsgVer1 implements PcepInitiateMsg { | ... | @@ -325,7 +325,8 @@ class PcepInitiateMsgVer1 implements PcepInitiateMsg { |
325 | 325 | ||
326 | @Override | 326 | @Override |
327 | public String toString() { | 327 | public String toString() { |
328 | - return MoreObjects.toStringHelper(getClass()).add("PcInitiaitedLspRequestList", llPcInitiatedLspRequestList) | 328 | + return MoreObjects.toStringHelper(getClass()) |
329 | + .add("PcInitiaitedLspRequestList", llPcInitiatedLspRequestList) | ||
329 | .toString(); | 330 | .toString(); |
330 | } | 331 | } |
331 | } | 332 | } | ... | ... |
... | @@ -257,6 +257,8 @@ public class PcepInterLayerObjectVer1 implements PcepInterLayerObject { | ... | @@ -257,6 +257,8 @@ public class PcepInterLayerObjectVer1 implements PcepInterLayerObject { |
257 | 257 | ||
258 | @Override | 258 | @Override |
259 | public String toString() { | 259 | public String toString() { |
260 | - return MoreObjects.toStringHelper(getClass()).add("IFlag", bIFlag).add("NFlag", bNFlag).toString(); | 260 | + return MoreObjects.toStringHelper(getClass()) |
261 | + .add("IFlag", bIFlag) | ||
262 | + .add("NFlag", bNFlag).toString(); | ||
261 | } | 263 | } |
262 | } | 264 | } | ... | ... |
... | @@ -292,7 +292,8 @@ public class PcepIroObjectVer1 implements PcepIroObject { | ... | @@ -292,7 +292,8 @@ public class PcepIroObjectVer1 implements PcepIroObject { |
292 | 292 | ||
293 | @Override | 293 | @Override |
294 | public String toString() { | 294 | public String toString() { |
295 | - return MoreObjects.toStringHelper(getClass()).add("IroObjectHeader", iroObjHeader) | 295 | + return MoreObjects.toStringHelper(getClass()) |
296 | + .add("IroObjectHeader", iroObjHeader) | ||
296 | .add("SubObjects", llSubObjects).toString(); | 297 | .add("SubObjects", llSubObjects).toString(); |
297 | } | 298 | } |
298 | } | 299 | } | ... | ... |
... | @@ -361,7 +361,10 @@ public class PcepLabelObjectVer1 implements PcepLabelObject { | ... | @@ -361,7 +361,10 @@ public class PcepLabelObjectVer1 implements PcepLabelObject { |
361 | 361 | ||
362 | @Override | 362 | @Override |
363 | public String toString() { | 363 | public String toString() { |
364 | - return MoreObjects.toStringHelper(getClass()).add("OFlag", bOFlag).add("label", label) | 364 | + return MoreObjects.toStringHelper(getClass()) |
365 | - .add("OptionalTlvList", llOptionalTlv).toString(); | 365 | + .add("OFlag", bOFlag) |
366 | + .add("label", label) | ||
367 | + .add("OptionalTlvList", llOptionalTlv) | ||
368 | + .toString(); | ||
366 | } | 369 | } |
367 | } | 370 | } | ... | ... |
... | @@ -367,7 +367,11 @@ public class PcepLabelRangeObjectVer1 implements PcepLabelRangeObject { | ... | @@ -367,7 +367,11 @@ public class PcepLabelRangeObjectVer1 implements PcepLabelRangeObject { |
367 | 367 | ||
368 | @Override | 368 | @Override |
369 | public String toString() { | 369 | public String toString() { |
370 | - return MoreObjects.toStringHelper(getClass()).add("LabelType", labelType).add("rangeSize", rangeSize) | 370 | + return MoreObjects.toStringHelper(getClass()) |
371 | - .add("labelBase", labelBase).add("optionalTlvList", llOptionalTlv).toString(); | 371 | + .add("LabelType", labelType) |
372 | + .add("rangeSize", rangeSize) | ||
373 | + .add("labelBase", labelBase) | ||
374 | + .add("optionalTlvList", llOptionalTlv) | ||
375 | + .toString(); | ||
372 | } | 376 | } |
373 | } | 377 | } | ... | ... |
... | @@ -191,6 +191,8 @@ class PcepLabelRangeResvMsgVer1 implements PcepLabelRangeResvMsg { | ... | @@ -191,6 +191,8 @@ class PcepLabelRangeResvMsgVer1 implements PcepLabelRangeResvMsg { |
191 | 191 | ||
192 | @Override | 192 | @Override |
193 | public String toString() { | 193 | public String toString() { |
194 | - return MoreObjects.toStringHelper(getClass()).add("labelRange", labelRange).toString(); | 194 | + return MoreObjects.toStringHelper(getClass()) |
195 | + .add("labelRange", labelRange) | ||
196 | + .toString(); | ||
195 | } | 197 | } |
196 | } | 198 | } | ... | ... |
... | @@ -160,7 +160,9 @@ public class PcepLabelRangeVer1 implements PcepLabelRange { | ... | @@ -160,7 +160,9 @@ public class PcepLabelRangeVer1 implements PcepLabelRange { |
160 | 160 | ||
161 | @Override | 161 | @Override |
162 | public String toString() { | 162 | public String toString() { |
163 | - return MoreObjects.toStringHelper(getClass()).add("srpObject", srpObject) | 163 | + return MoreObjects.toStringHelper(getClass()) |
164 | - .add("LabelRangeList", llLabelRangeList).toString(); | 164 | + .add("srpObject", srpObject) |
165 | + .add("LabelRangeList", llLabelRangeList) | ||
166 | + .toString(); | ||
165 | } | 167 | } |
166 | } | 168 | } | ... | ... |
... | @@ -232,6 +232,8 @@ class PcepLabelUpdateMsgVer1 implements PcepLabelUpdateMsg { | ... | @@ -232,6 +232,8 @@ class PcepLabelUpdateMsgVer1 implements PcepLabelUpdateMsg { |
232 | 232 | ||
233 | @Override | 233 | @Override |
234 | public String toString() { | 234 | public String toString() { |
235 | - return MoreObjects.toStringHelper(getClass()).add("PcLabelUpdateList", llPcLabelUpdateList).toString(); | 235 | + return MoreObjects.toStringHelper(getClass()) |
236 | + .add("PcLabelUpdateList", llPcLabelUpdateList) | ||
237 | + .toString(); | ||
236 | } | 238 | } |
237 | } | 239 | } | ... | ... |
... | @@ -33,7 +33,6 @@ import org.slf4j.Logger; | ... | @@ -33,7 +33,6 @@ import org.slf4j.Logger; |
33 | import org.slf4j.LoggerFactory; | 33 | import org.slf4j.LoggerFactory; |
34 | 34 | ||
35 | import com.google.common.base.MoreObjects; | 35 | import com.google.common.base.MoreObjects; |
36 | -import com.google.common.base.MoreObjects.ToStringHelper; | ||
37 | 36 | ||
38 | /** | 37 | /** |
39 | * Provides PCEP LABEL update . | 38 | * Provides PCEP LABEL update . |
... | @@ -348,14 +347,10 @@ public class PcepLabelUpdateVer1 implements PcepLabelUpdate { | ... | @@ -348,14 +347,10 @@ public class PcepLabelUpdateVer1 implements PcepLabelUpdate { |
348 | 347 | ||
349 | @Override | 348 | @Override |
350 | public String toString() { | 349 | public String toString() { |
351 | - ToStringHelper toStrHelper = MoreObjects.toStringHelper(getClass()); | 350 | + return MoreObjects.toStringHelper(getClass()) |
352 | - | 351 | + .omitNullValues() |
353 | - if (labelDownload != null) { | 352 | + .add("LabelDownload", labelDownload) |
354 | - toStrHelper.add("LabelDownload", labelDownload); | 353 | + .add("LabelMap", labelMap) |
355 | - } | 354 | + .toString(); |
356 | - if (labelMap != null) { | ||
357 | - toStrHelper.add("LabelMap", labelMap); | ||
358 | - } | ||
359 | - return toStrHelper.toString(); | ||
360 | } | 355 | } |
361 | } | 356 | } | ... | ... |
... | @@ -562,8 +562,14 @@ public class PcepLspObjectVer1 implements PcepLspObject { | ... | @@ -562,8 +562,14 @@ public class PcepLspObjectVer1 implements PcepLspObject { |
562 | 562 | ||
563 | @Override | 563 | @Override |
564 | public String toString() { | 564 | public String toString() { |
565 | - return MoreObjects.toStringHelper(getClass()).add("PlspIDValue", iPlspId).add("OFlag", yOFlag) | 565 | + return MoreObjects.toStringHelper(getClass()) |
566 | - .add("AFlag", bAFlag).add("RFlag", bRFlag).add("SFlag", bSFlag).add("DFlag", bDFlag) | 566 | + .add("PlspIDValue", iPlspId) |
567 | - .add("OptionalTlvList", llOptionalTlv).toString(); | 567 | + .add("OFlag", yOFlag) |
568 | + .add("AFlag", bAFlag) | ||
569 | + .add("RFlag", bRFlag) | ||
570 | + .add("SFlag", bSFlag) | ||
571 | + .add("DFlag", bDFlag) | ||
572 | + .add("OptionalTlvList", llOptionalTlv) | ||
573 | + .toString(); | ||
568 | } | 574 | } |
569 | } | 575 | } | ... | ... |
... | @@ -516,8 +516,14 @@ public class PcepLspaObjectVer1 implements PcepLspaObject { | ... | @@ -516,8 +516,14 @@ public class PcepLspaObjectVer1 implements PcepLspaObject { |
516 | 516 | ||
517 | @Override | 517 | @Override |
518 | public String toString() { | 518 | public String toString() { |
519 | - return MoreObjects.toStringHelper(getClass()).add("LFlag", bLFlag).add("SetupPriority", cSetupPriority) | 519 | + return MoreObjects.toStringHelper(getClass()) |
520 | - .add("HoldPriority", cHoldPriority).add("IncludeAll", iIncludeAll).add("IncludeAny", iIncludeAny) | 520 | + .add("LFlag", bLFlag) |
521 | - .add("ExcludeAny", iExcludeAny).add("OptionalTlvList", llOptionalTlv).toString(); | 521 | + .add("SetupPriority", cSetupPriority) |
522 | + .add("HoldPriority", cHoldPriority) | ||
523 | + .add("IncludeAll", iIncludeAll) | ||
524 | + .add("IncludeAny", iIncludeAny) | ||
525 | + .add("ExcludeAny", iExcludeAny) | ||
526 | + .add("OptionalTlvList", llOptionalTlv) | ||
527 | + .toString(); | ||
522 | } | 528 | } |
523 | } | 529 | } | ... | ... |
... | @@ -366,7 +366,11 @@ public class PcepMetricObjectVer1 implements PcepMetricObject { | ... | @@ -366,7 +366,11 @@ public class PcepMetricObjectVer1 implements PcepMetricObject { |
366 | 366 | ||
367 | @Override | 367 | @Override |
368 | public String toString() { | 368 | public String toString() { |
369 | - return MoreObjects.toStringHelper(getClass()).add("MetricValue", iMetricVal).add("BFlag", bBFlag) | 369 | + return MoreObjects.toStringHelper(getClass()) |
370 | - .add("CFlag", bCFlag).add("BType", bType).toString(); | 370 | + .add("MetricValue", iMetricVal) |
371 | + .add("BFlag", bBFlag) | ||
372 | + .add("CFlag", bCFlag) | ||
373 | + .add("BType", bType) | ||
374 | + .toString(); | ||
371 | } | 375 | } |
372 | } | 376 | } | ... | ... |
... | @@ -164,7 +164,9 @@ public class PcepMsgPathVer1 implements PcepMsgPath { | ... | @@ -164,7 +164,9 @@ public class PcepMsgPathVer1 implements PcepMsgPath { |
164 | 164 | ||
165 | @Override | 165 | @Override |
166 | public String toString() { | 166 | public String toString() { |
167 | - return MoreObjects.toStringHelper(getClass()).add("EroObject", eroObj).add("AttributeList", attrList) | 167 | + return MoreObjects.toStringHelper(getClass()) |
168 | + .add("EroObject", eroObj) | ||
169 | + .add("AttributeList", attrList) | ||
168 | .toString(); | 170 | .toString(); |
169 | } | 171 | } |
170 | -} | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
172 | +} | ... | ... |
... | @@ -197,6 +197,8 @@ public class PcepOpenMsgVer1 implements PcepOpenMsg { | ... | @@ -197,6 +197,8 @@ public class PcepOpenMsgVer1 implements PcepOpenMsg { |
197 | 197 | ||
198 | @Override | 198 | @Override |
199 | public String toString() { | 199 | public String toString() { |
200 | - return MoreObjects.toStringHelper(getClass()).add("OpenObject", pcepOpenObj).toString(); | 200 | + return MoreObjects.toStringHelper(getClass()) |
201 | + .add("OpenObject", pcepOpenObj) | ||
202 | + .toString(); | ||
201 | } | 203 | } |
202 | } | 204 | } | ... | ... |
... | @@ -480,8 +480,12 @@ public class PcepOpenObjectVer1 implements PcepOpenObject { | ... | @@ -480,8 +480,12 @@ public class PcepOpenObjectVer1 implements PcepOpenObject { |
480 | 480 | ||
481 | @Override | 481 | @Override |
482 | public String toString() { | 482 | public String toString() { |
483 | - return MoreObjects.toStringHelper(getClass()).add("ObjectHeader", openObjHeader) | 483 | + return MoreObjects.toStringHelper(getClass()) |
484 | - .add("Keepalive", keepAliveTime).add("DeadTimer", deadTime).add("SessionId", sessionId) | 484 | + .add("ObjectHeader", openObjHeader) |
485 | - .add("OptionalTlv", llOptionalTlv).toString(); | 485 | + .add("Keepalive", keepAliveTime) |
486 | + .add("DeadTimer", deadTime) | ||
487 | + .add("SessionId", sessionId) | ||
488 | + .add("OptionalTlv", llOptionalTlv) | ||
489 | + .toString(); | ||
486 | } | 490 | } |
487 | } | 491 | } | ... | ... |
... | @@ -432,8 +432,14 @@ public class PcepRPObjectVer1 implements PcepRPObject { | ... | @@ -432,8 +432,14 @@ public class PcepRPObjectVer1 implements PcepRPObject { |
432 | 432 | ||
433 | @Override | 433 | @Override |
434 | public String toString() { | 434 | public String toString() { |
435 | - return MoreObjects.toStringHelper(getClass()).add("ObjectHeader", rpObjHeader).add("OFlag", (bOFlag) ? 1 : 0) | 435 | + return MoreObjects.toStringHelper(getClass()) |
436 | - .add("BFlag", (bBFlag) ? 1 : 0).add("RFlag", (bRFlag) ? 1 : 0).add("PriFlag", yPriFlag) | 436 | + .add("ObjectHeader", rpObjHeader) |
437 | - .add("RequestIdNumber", iRequestIdNum).add("OptionalTlv", llOptionalTlv).toString(); | 437 | + .add("OFlag", (bOFlag) ? 1 : 0) |
438 | + .add("BFlag", (bBFlag) ? 1 : 0) | ||
439 | + .add("RFlag", (bRFlag) ? 1 : 0) | ||
440 | + .add("PriFlag", yPriFlag) | ||
441 | + .add("RequestIdNumber", iRequestIdNum) | ||
442 | + .add("OptionalTlv", llOptionalTlv) | ||
443 | + .toString(); | ||
438 | } | 444 | } |
439 | } | 445 | } | ... | ... |
... | @@ -302,6 +302,8 @@ class PcepReportMsgVer1 implements PcepReportMsg { | ... | @@ -302,6 +302,8 @@ class PcepReportMsgVer1 implements PcepReportMsg { |
302 | 302 | ||
303 | @Override | 303 | @Override |
304 | public String toString() { | 304 | public String toString() { |
305 | - return MoreObjects.toStringHelper(getClass()).add("StateReportList", llStateReportList).toString(); | 305 | + return MoreObjects.toStringHelper(getClass()) |
306 | + .add("StateReportList", llStateReportList) | ||
307 | + .toString(); | ||
306 | } | 308 | } |
307 | } | 309 | } | ... | ... |
... | @@ -338,6 +338,8 @@ public class PcepRroObjectVer1 implements PcepRroObject { | ... | @@ -338,6 +338,8 @@ public class PcepRroObjectVer1 implements PcepRroObject { |
338 | 338 | ||
339 | @Override | 339 | @Override |
340 | public String toString() { | 340 | public String toString() { |
341 | - return MoreObjects.toStringHelper(getClass()).add("SubObjects", llSubObjects).toString(); | 341 | + return MoreObjects.toStringHelper(getClass()) |
342 | + .add("SubObjects", llSubObjects) | ||
343 | + .toString(); | ||
342 | } | 344 | } |
343 | } | 345 | } | ... | ... |
... | @@ -383,7 +383,10 @@ public class PcepSrpObjectVer1 implements PcepSrpObject { | ... | @@ -383,7 +383,10 @@ public class PcepSrpObjectVer1 implements PcepSrpObject { |
383 | 383 | ||
384 | @Override | 384 | @Override |
385 | public String toString() { | 385 | public String toString() { |
386 | - return MoreObjects.toStringHelper(getClass()).add("RFlag", bRFlag).add("SRPID", srpId) | 386 | + return MoreObjects.toStringHelper(getClass()) |
387 | - .add("OptionalTlvList", llOptionalTlv).toString(); | 387 | + .add("RFlag", bRFlag) |
388 | + .add("SRPID", srpId) | ||
389 | + .add("OptionalTlvList", llOptionalTlv) | ||
390 | + .toString(); | ||
388 | } | 391 | } |
389 | } | 392 | } | ... | ... |
... | @@ -411,17 +411,11 @@ public class PcepStateReportVer1 implements PcepStateReport { | ... | @@ -411,17 +411,11 @@ public class PcepStateReportVer1 implements PcepStateReport { |
411 | 411 | ||
412 | @Override | 412 | @Override |
413 | public String toString() { | 413 | public String toString() { |
414 | - ToStringHelper toStrHelper = MoreObjects.toStringHelper(getClass()); | 414 | + return MoreObjects.toStringHelper(getClass()) |
415 | - | 415 | + .omitNullValues() |
416 | - if (this.srpObject != null) { | 416 | + .add("SrpObject", srpObject) |
417 | - toStrHelper.add("SrpObject", srpObject); | 417 | + .add("LspObject", lspObject) |
418 | - } | 418 | + .add("MsgPath", msgPath) |
419 | - if (this.lspObject != null) { | 419 | + .toString(); |
420 | - toStrHelper.add("LspObject", lspObject); | ||
421 | - } | ||
422 | - if (this.msgPath != null) { | ||
423 | - toStrHelper.add("MsgPath", msgPath); | ||
424 | - } | ||
425 | - return toStrHelper.toString(); | ||
426 | } | 420 | } |
427 | } | 421 | } | ... | ... |
... | @@ -494,8 +494,13 @@ public class PcepTEObjectVer1 implements PcepTEObject { | ... | @@ -494,8 +494,13 @@ public class PcepTEObjectVer1 implements PcepTEObject { |
494 | 494 | ||
495 | @Override | 495 | @Override |
496 | public String toString() { | 496 | public String toString() { |
497 | - return MoreObjects.toStringHelper(getClass()).add("ObjectHeader", teObjHeader).add("ProtocolId", yProtocolId) | 497 | + return MoreObjects.toStringHelper(getClass()) |
498 | - .add("RFlag", (bRFlag) ? 1 : 0).add("SFlag", (bSFlag) ? 1 : 0).add("TeId", iTEId) | 498 | + .add("ObjectHeader", teObjHeader) |
499 | - .add("OptionalTlv", llOptionalTlv).toString(); | 499 | + .add("ProtocolId", yProtocolId) |
500 | + .add("RFlag", (bRFlag) ? 1 : 0) | ||
501 | + .add("SFlag", (bSFlag) ? 1 : 0) | ||
502 | + .add("TeId", iTEId) | ||
503 | + .add("OptionalTlv", llOptionalTlv) | ||
504 | + .toString(); | ||
500 | } | 505 | } |
501 | } | 506 | } | ... | ... |
... | @@ -218,6 +218,8 @@ class PcepTEReportMsgVer1 implements PcepTEReportMsg { | ... | @@ -218,6 +218,8 @@ class PcepTEReportMsgVer1 implements PcepTEReportMsg { |
218 | 218 | ||
219 | @Override | 219 | @Override |
220 | public String toString() { | 220 | public String toString() { |
221 | - return MoreObjects.toStringHelper(getClass()).add("TeReportList", teReportList).toString(); | 221 | + return MoreObjects.toStringHelper(getClass()) |
222 | + .add("TeReportList", teReportList) | ||
223 | + .toString(); | ||
222 | } | 224 | } |
223 | } | 225 | } | ... | ... |
... | @@ -293,6 +293,8 @@ class PcepUpdateMsgVer1 implements PcepUpdateMsg { | ... | @@ -293,6 +293,8 @@ class PcepUpdateMsgVer1 implements PcepUpdateMsg { |
293 | 293 | ||
294 | @Override | 294 | @Override |
295 | public String toString() { | 295 | public String toString() { |
296 | - return MoreObjects.toStringHelper(getClass()).add("UpdateRequestList", llUpdateRequestList).toString(); | 296 | + return MoreObjects.toStringHelper(getClass()) |
297 | + .add("UpdateRequestList", llUpdateRequestList) | ||
298 | + .toString(); | ||
297 | } | 299 | } |
298 | } | 300 | } | ... | ... |
... | @@ -190,7 +190,10 @@ public class PcepUpdateRequestVer1 implements PcepUpdateRequest { | ... | @@ -190,7 +190,10 @@ public class PcepUpdateRequestVer1 implements PcepUpdateRequest { |
190 | 190 | ||
191 | @Override | 191 | @Override |
192 | public String toString() { | 192 | public String toString() { |
193 | - return MoreObjects.toStringHelper(getClass()).add("SrpObject", srpObject).add("LspObject", lspObject) | 193 | + return MoreObjects.toStringHelper(getClass()) |
194 | - .add("MsgPath", msgPath).toString(); | 194 | + .add("SrpObject", srpObject) |
195 | + .add("LspObject", lspObject) | ||
196 | + .add("MsgPath", msgPath) | ||
197 | + .toString(); | ||
195 | } | 198 | } |
196 | -} | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
199 | +} | ... | ... |
... | @@ -127,7 +127,10 @@ public class AdministrativeGroupTlv implements PcepValueType { | ... | @@ -127,7 +127,10 @@ public class AdministrativeGroupTlv implements PcepValueType { |
127 | 127 | ||
128 | @Override | 128 | @Override |
129 | public String toString() { | 129 | public String toString() { |
130 | - return MoreObjects.toStringHelper(getClass()).add("Type", TYPE).add("Length", LENGTH).add("Value", rawValue) | 130 | + return MoreObjects.toStringHelper(getClass()) |
131 | + .add("Type", TYPE) | ||
132 | + .add("Length", LENGTH) | ||
133 | + .add("Value", rawValue) | ||
131 | .toString(); | 134 | .toString(); |
132 | } | 135 | } |
133 | } | 136 | } | ... | ... |
... | @@ -127,7 +127,10 @@ public class BGPLSidentifierTlv implements PcepValueType { | ... | @@ -127,7 +127,10 @@ public class BGPLSidentifierTlv implements PcepValueType { |
127 | 127 | ||
128 | @Override | 128 | @Override |
129 | public String toString() { | 129 | public String toString() { |
130 | - return MoreObjects.toStringHelper(getClass()).add("Type", TYPE).add("Length", LENGTH).add("Value", rawValue) | 130 | + return MoreObjects.toStringHelper(getClass()) |
131 | + .add("Type", TYPE) | ||
132 | + .add("Length", LENGTH) | ||
133 | + .add("Value", rawValue) | ||
131 | .toString(); | 134 | .toString(); |
132 | } | 135 | } |
133 | } | 136 | } | ... | ... |
... | @@ -11,7 +11,6 @@ import org.slf4j.Logger; | ... | @@ -11,7 +11,6 @@ import org.slf4j.Logger; |
11 | import org.slf4j.LoggerFactory; | 11 | import org.slf4j.LoggerFactory; |
12 | 12 | ||
13 | import com.google.common.base.MoreObjects; | 13 | import com.google.common.base.MoreObjects; |
14 | -import com.google.common.base.MoreObjects.ToStringHelper; | ||
15 | 14 | ||
16 | /** | 15 | /** |
17 | * Provide the error object list with open object. | 16 | * Provide the error object list with open object. |
... | @@ -137,14 +136,10 @@ public class ErrorObjListWithOpen { | ... | @@ -137,14 +136,10 @@ public class ErrorObjListWithOpen { |
137 | 136 | ||
138 | @Override | 137 | @Override |
139 | public String toString() { | 138 | public String toString() { |
140 | - ToStringHelper toStrHelper = MoreObjects.toStringHelper(getClass()); | 139 | + return MoreObjects.toStringHelper(getClass()) |
141 | - | 140 | + .omitNullValues() |
142 | - toStrHelper.add("ErrorObjList", llerrorObjList); | 141 | + .add("ErrorObjList", llerrorObjList) |
143 | - | 142 | + .add("Open", openObject) |
144 | - // OPEN Object is optional | 143 | + .toString(); |
145 | - if (openObject != null) { | ||
146 | - toStrHelper.add("Open", openObject); | ||
147 | - } | ||
148 | - return toStrHelper.toString(); | ||
149 | } | 144 | } |
150 | } | 145 | } | ... | ... |
... | @@ -129,7 +129,10 @@ public class GmplsCapabilityTlv implements PcepValueType { | ... | @@ -129,7 +129,10 @@ public class GmplsCapabilityTlv implements PcepValueType { |
129 | 129 | ||
130 | @Override | 130 | @Override |
131 | public String toString() { | 131 | public String toString() { |
132 | - return MoreObjects.toStringHelper(getClass()).add("Type", TYPE).add("Length", LENGTH).add("Value", rawValue) | 132 | + return MoreObjects.toStringHelper(getClass()) |
133 | + .add("Type", TYPE) | ||
134 | + .add("Length", LENGTH) | ||
135 | + .add("Value", rawValue) | ||
133 | .toString(); | 136 | .toString(); |
134 | } | 137 | } |
135 | } | 138 | } | ... | ... |
... | @@ -128,7 +128,10 @@ public class IPv4InterfaceAddressTlv implements PcepValueType { | ... | @@ -128,7 +128,10 @@ public class IPv4InterfaceAddressTlv implements PcepValueType { |
128 | 128 | ||
129 | @Override | 129 | @Override |
130 | public String toString() { | 130 | public String toString() { |
131 | - return MoreObjects.toStringHelper(getClass()).add("Type", TYPE).add("Length", LENGTH).add("Value", rawValue) | 131 | + return MoreObjects.toStringHelper(getClass()) |
132 | + .add("Type", TYPE) | ||
133 | + .add("Length", LENGTH) | ||
134 | + .add("Value", rawValue) | ||
132 | .toString(); | 135 | .toString(); |
133 | } | 136 | } |
134 | -} | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
137 | +} | ... | ... |
... | @@ -128,7 +128,10 @@ public class IPv4NeighborAddressTlv implements PcepValueType { | ... | @@ -128,7 +128,10 @@ public class IPv4NeighborAddressTlv implements PcepValueType { |
128 | 128 | ||
129 | @Override | 129 | @Override |
130 | public String toString() { | 130 | public String toString() { |
131 | - return MoreObjects.toStringHelper(getClass()).add("Type", TYPE).add("Length", LENGTH).add("Value", rawValue) | 131 | + return MoreObjects.toStringHelper(getClass()) |
132 | + .add("Type", TYPE) | ||
133 | + .add("Length", LENGTH) | ||
134 | + .add("Value", rawValue) | ||
132 | .toString(); | 135 | .toString(); |
133 | } | 136 | } |
134 | -} | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
137 | +} | ... | ... |
... | @@ -127,7 +127,10 @@ public class IPv4TERouterIdOfLocalNodeTlv implements PcepValueType { | ... | @@ -127,7 +127,10 @@ public class IPv4TERouterIdOfLocalNodeTlv implements PcepValueType { |
127 | 127 | ||
128 | @Override | 128 | @Override |
129 | public String toString() { | 129 | public String toString() { |
130 | - return MoreObjects.toStringHelper(getClass()).add("Type", TYPE).add("Length", LENGTH).add("Value", rawValue) | 130 | + return MoreObjects.toStringHelper(getClass()) |
131 | + .add("Type", TYPE) | ||
132 | + .add("Length", LENGTH) | ||
133 | + .add("Value", rawValue) | ||
131 | .toString(); | 134 | .toString(); |
132 | } | 135 | } |
133 | } | 136 | } | ... | ... |
... | @@ -128,7 +128,10 @@ public class IPv4TERouterIdOfRemoteNodeTlv implements PcepValueType { | ... | @@ -128,7 +128,10 @@ public class IPv4TERouterIdOfRemoteNodeTlv implements PcepValueType { |
128 | 128 | ||
129 | @Override | 129 | @Override |
130 | public String toString() { | 130 | public String toString() { |
131 | - return MoreObjects.toStringHelper(getClass()).add("Type", TYPE).add("Length", LENGTH).add("Value", rawValue) | 131 | + return MoreObjects.toStringHelper(getClass()) |
132 | + .add("Type", TYPE) | ||
133 | + .add("Length", LENGTH) | ||
134 | + .add("Value", rawValue) | ||
132 | .toString(); | 135 | .toString(); |
133 | } | 136 | } |
134 | } | 137 | } | ... | ... |
... | @@ -160,7 +160,12 @@ public class LabelSubObject implements PcepValueType { | ... | @@ -160,7 +160,12 @@ public class LabelSubObject implements PcepValueType { |
160 | 160 | ||
161 | @Override | 161 | @Override |
162 | public String toString() { | 162 | public String toString() { |
163 | - return MoreObjects.toStringHelper(getClass()).add("type", TYPE).add("Length", LENGTH).add("flags", flags) | 163 | + return MoreObjects.toStringHelper(getClass()) |
164 | - .add("C-type", cType).add("contents", contents).toString(); | 164 | + .add("type", TYPE) |
165 | + .add("Length", LENGTH) | ||
166 | + .add("flags", flags) | ||
167 | + .add("C-type", cType) | ||
168 | + .add("contents", contents) | ||
169 | + .toString(); | ||
165 | } | 170 | } |
166 | } | 171 | } | ... | ... |
... | @@ -145,8 +145,11 @@ public class LinkLocalRemoteIdentifiersTlv implements PcepValueType { | ... | @@ -145,8 +145,11 @@ public class LinkLocalRemoteIdentifiersTlv implements PcepValueType { |
145 | 145 | ||
146 | @Override | 146 | @Override |
147 | public String toString() { | 147 | public String toString() { |
148 | - return MoreObjects.toStringHelper(getClass()).add("Type", TYPE).add("Length", LENGTH) | 148 | + return MoreObjects.toStringHelper(getClass()) |
149 | - .add("LinkLocalIdentifier", iLinkLocalIdentifier).add("LinkRemoteIdentifier", iLinkRemoteIdentifier) | 149 | + .add("Type", TYPE) |
150 | + .add("Length", LENGTH) | ||
151 | + .add("LinkLocalIdentifier", iLinkLocalIdentifier) | ||
152 | + .add("LinkRemoteIdentifier", iLinkRemoteIdentifier) | ||
150 | .toString(); | 153 | .toString(); |
151 | } | 154 | } |
152 | } | 155 | } | ... | ... |
... | @@ -133,7 +133,10 @@ public class LinkProtectionTypeTlv implements PcepValueType { | ... | @@ -133,7 +133,10 @@ public class LinkProtectionTypeTlv implements PcepValueType { |
133 | 133 | ||
134 | @Override | 134 | @Override |
135 | public String toString() { | 135 | public String toString() { |
136 | - return MoreObjects.toStringHelper(getClass()).add("Type", TYPE).add("Length", LENGTH) | 136 | + return MoreObjects.toStringHelper(getClass()) |
137 | - .add("ProtectionCap", protectionCap).toString(); | 137 | + .add("Type", TYPE) |
138 | + .add("Length", LENGTH) | ||
139 | + .add("ProtectionCap", protectionCap) | ||
140 | + .toString(); | ||
138 | } | 141 | } |
139 | -} | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
142 | +} | ... | ... |
... | @@ -237,7 +237,10 @@ public class LocalTENodeDescriptorsTlv implements PcepValueType { | ... | @@ -237,7 +237,10 @@ public class LocalTENodeDescriptorsTlv implements PcepValueType { |
237 | 237 | ||
238 | @Override | 238 | @Override |
239 | public String toString() { | 239 | public String toString() { |
240 | - return MoreObjects.toStringHelper(getClass()).add("Type", TYPE).add("Length", hLength) | 240 | + return MoreObjects.toStringHelper(getClass()) |
241 | - .add("NodeDescriptorSubTLVs", llNodeDescriptorSubTLVs).toString(); | 241 | + .add("Type", TYPE) |
242 | + .add("Length", hLength) | ||
243 | + .add("NodeDescriptorSubTLVs", llNodeDescriptorSubTLVs) | ||
244 | + .toString(); | ||
242 | } | 245 | } |
243 | } | 246 | } | ... | ... |
... | @@ -209,7 +209,10 @@ public class MPLSProtocolMaskTlv implements PcepValueType { | ... | @@ -209,7 +209,10 @@ public class MPLSProtocolMaskTlv implements PcepValueType { |
209 | 209 | ||
210 | @Override | 210 | @Override |
211 | public String toString() { | 211 | public String toString() { |
212 | - return MoreObjects.toStringHelper(getClass()).add("Type", TYPE).add("Length", LENGTH).add("Value", rawValue) | 212 | + return MoreObjects.toStringHelper(getClass()) |
213 | + .add("Type", TYPE) | ||
214 | + .add("Length", LENGTH) | ||
215 | + .add("Value", rawValue) | ||
213 | .toString(); | 216 | .toString(); |
214 | } | 217 | } |
215 | } | 218 | } | ... | ... |
... | @@ -128,7 +128,10 @@ public class MaximumLinkBandwidthTlv implements PcepValueType { | ... | @@ -128,7 +128,10 @@ public class MaximumLinkBandwidthTlv implements PcepValueType { |
128 | 128 | ||
129 | @Override | 129 | @Override |
130 | public String toString() { | 130 | public String toString() { |
131 | - return MoreObjects.toStringHelper(getClass()).add("Type", TYPE).add("Length", LENGTH).add("Value", rawValue) | 131 | + return MoreObjects.toStringHelper(getClass()) |
132 | + .add("Type", TYPE) | ||
133 | + .add("Length", LENGTH) | ||
134 | + .add("Value", rawValue) | ||
132 | .toString(); | 135 | .toString(); |
133 | } | 136 | } |
134 | } | 137 | } | ... | ... |
... | @@ -127,7 +127,10 @@ public class MaximumReservableLinkBandwidthTlv implements PcepValueType { | ... | @@ -127,7 +127,10 @@ public class MaximumReservableLinkBandwidthTlv implements PcepValueType { |
127 | 127 | ||
128 | @Override | 128 | @Override |
129 | public String toString() { | 129 | public String toString() { |
130 | - return MoreObjects.toStringHelper(getClass()).add("Type", TYPE).add("Length", LENGTH).add("Value", rawValue) | 130 | + return MoreObjects.toStringHelper(getClass()) |
131 | + .add("Type", TYPE) | ||
132 | + .add("Length", LENGTH) | ||
133 | + .add("Value", rawValue) | ||
131 | .toString(); | 134 | .toString(); |
132 | } | 135 | } |
133 | } | 136 | } | ... | ... |
... | @@ -153,7 +153,11 @@ public class NexthopUnnumberedIPv4IDTlv implements PcepValueType { | ... | @@ -153,7 +153,11 @@ public class NexthopUnnumberedIPv4IDTlv implements PcepValueType { |
153 | 153 | ||
154 | @Override | 154 | @Override |
155 | public String toString() { | 155 | public String toString() { |
156 | - return MoreObjects.toStringHelper(getClass()).add("Type", TYPE).add("Length", LENGTH).add("NodeId", nodeID) | 156 | + return MoreObjects.toStringHelper(getClass()) |
157 | - .add("InterfaceId", interfaceID).toString(); | 157 | + .add("Type", TYPE) |
158 | + .add("Length", LENGTH) | ||
159 | + .add("NodeId", nodeID) | ||
160 | + .add("InterfaceId", interfaceID) | ||
161 | + .toString(); | ||
158 | } | 162 | } |
159 | } | 163 | } | ... | ... |
... | @@ -222,8 +222,13 @@ public class NodeFlagBitsTlv implements PcepValueType { | ... | @@ -222,8 +222,13 @@ public class NodeFlagBitsTlv implements PcepValueType { |
222 | 222 | ||
223 | @Override | 223 | @Override |
224 | public String toString() { | 224 | public String toString() { |
225 | - return MoreObjects.toStringHelper(getClass()).add("Type", TYPE).add("Length", LENGTH) | 225 | + return MoreObjects.toStringHelper(getClass()) |
226 | - .add("OFlag", (bOFlag) ? 1 : 0).add("TFlag", (bTFlag) ? 1 : 0).add("EFlag", (bEFlag) ? 1 : 0) | 226 | + .add("Type", TYPE) |
227 | - .add("BFlag", (bBFlag) ? 1 : 0).toString(); | 227 | + .add("Length", LENGTH) |
228 | + .add("OFlag", (bOFlag) ? 1 : 0) | ||
229 | + .add("TFlag", (bTFlag) ? 1 : 0) | ||
230 | + .add("EFlag", (bEFlag) ? 1 : 0) | ||
231 | + .add("BFlag", (bBFlag) ? 1 : 0) | ||
232 | + .toString(); | ||
228 | } | 233 | } |
229 | } | 234 | } | ... | ... |
... | @@ -126,7 +126,10 @@ public class OSPFareaIDsubTlv implements PcepValueType { | ... | @@ -126,7 +126,10 @@ public class OSPFareaIDsubTlv implements PcepValueType { |
126 | 126 | ||
127 | @Override | 127 | @Override |
128 | public String toString() { | 128 | public String toString() { |
129 | - return MoreObjects.toStringHelper(getClass()).add("Type", TYPE).add("Length", LENGTH).add("Value", rawValue) | 129 | + return MoreObjects.toStringHelper(getClass()) |
130 | + .add("Type", TYPE) | ||
131 | + .add("Length", LENGTH) | ||
132 | + .add("Value", rawValue) | ||
130 | .toString(); | 133 | .toString(); |
131 | } | 134 | } |
132 | } | 135 | } | ... | ... |
... | @@ -140,7 +140,10 @@ public class PathSetupTypeTlv implements PcepValueType { | ... | @@ -140,7 +140,10 @@ public class PathSetupTypeTlv implements PcepValueType { |
140 | 140 | ||
141 | @Override | 141 | @Override |
142 | public String toString() { | 142 | public String toString() { |
143 | - return MoreObjects.toStringHelper(getClass()).add("Type", TYPE).add("Length", LENGTH).add("PST", pst) | 143 | + return MoreObjects.toStringHelper(getClass()) |
144 | + .add("Type", TYPE) | ||
145 | + .add("Length", LENGTH) | ||
146 | + .add("PST", pst) | ||
144 | .toString(); | 147 | .toString(); |
145 | } | 148 | } |
146 | } | 149 | } | ... | ... |
... | @@ -170,7 +170,10 @@ public class PceccCapabilityTlv implements PcepValueType { | ... | @@ -170,7 +170,10 @@ public class PceccCapabilityTlv implements PcepValueType { |
170 | 170 | ||
171 | @Override | 171 | @Override |
172 | public String toString() { | 172 | public String toString() { |
173 | - return MoreObjects.toStringHelper(getClass()).add("Type", TYPE).add("Length", LENGTH).add("Value", rawValue) | 173 | + return MoreObjects.toStringHelper(getClass()) |
174 | + .add("Type", TYPE) | ||
175 | + .add("Length", LENGTH) | ||
176 | + .add("Value", rawValue) | ||
174 | .toString(); | 177 | .toString(); |
175 | } | 178 | } |
176 | } | 179 | } | ... | ... |
... | @@ -113,7 +113,10 @@ public class PcepLabelDbVerTlv implements PcepValueType { | ... | @@ -113,7 +113,10 @@ public class PcepLabelDbVerTlv implements PcepValueType { |
113 | 113 | ||
114 | @Override | 114 | @Override |
115 | public String toString() { | 115 | public String toString() { |
116 | - return MoreObjects.toStringHelper(getClass()).add("Type", TYPE).add("Length", LENGTH).add("Value", rawValue) | 116 | + return MoreObjects.toStringHelper(getClass()) |
117 | + .add("Type", TYPE) | ||
118 | + .add("Length", LENGTH) | ||
119 | + .add("Value", rawValue) | ||
117 | .toString(); | 120 | .toString(); |
118 | } | 121 | } |
119 | } | 122 | } | ... | ... |
... | @@ -81,7 +81,10 @@ public class PcepLabelDownload { | ... | @@ -81,7 +81,10 @@ public class PcepLabelDownload { |
81 | 81 | ||
82 | @Override | 82 | @Override |
83 | public String toString() { | 83 | public String toString() { |
84 | - return MoreObjects.toStringHelper(getClass()).add("SrpObject", srpObject).add("LspObject", lspObject) | 84 | + return MoreObjects.toStringHelper(getClass()) |
85 | - .add("LabelObjectList", llLabelList).toString(); | 85 | + .add("SrpObject", srpObject) |
86 | + .add("LspObject", lspObject) | ||
87 | + .add("LabelObjectList", llLabelList) | ||
88 | + .toString(); | ||
86 | } | 89 | } |
87 | } | 90 | } | ... | ... |
... | @@ -92,6 +92,8 @@ public class PcepNaiIpv4NodeId implements PcepNai { | ... | @@ -92,6 +92,8 @@ public class PcepNaiIpv4NodeId implements PcepNai { |
92 | 92 | ||
93 | @Override | 93 | @Override |
94 | public String toString() { | 94 | public String toString() { |
95 | - return MoreObjects.toStringHelper(getClass()).add("IPv4NodeId", ipv4NodeId).toString(); | 95 | + return MoreObjects.toStringHelper(getClass()) |
96 | + .add("IPv4NodeId", ipv4NodeId) | ||
97 | + .toString(); | ||
96 | } | 98 | } |
97 | } | 99 | } | ... | ... |
... | @@ -95,6 +95,8 @@ public class PcepNaiIpv6NodeId implements PcepNai { | ... | @@ -95,6 +95,8 @@ public class PcepNaiIpv6NodeId implements PcepNai { |
95 | 95 | ||
96 | @Override | 96 | @Override |
97 | public String toString() { | 97 | public String toString() { |
98 | - return MoreObjects.toStringHelper(getClass()).add("IPV6NodeID", ipv6NodeId).toString(); | 98 | + return MoreObjects.toStringHelper(getClass()) |
99 | + .add("IPV6NodeID", ipv6NodeId) | ||
100 | + .toString(); | ||
99 | } | 101 | } |
100 | } | 102 | } | ... | ... |
... | @@ -110,7 +110,7 @@ public class PcepNaiUnnumberedAdjacencyIpv4 implements PcepNai { | ... | @@ -110,7 +110,7 @@ public class PcepNaiUnnumberedAdjacencyIpv4 implements PcepNai { |
110 | .add("localNodeId", localNodeId) | 110 | .add("localNodeId", localNodeId) |
111 | .add("localInterfaceId", localInterfaceId) | 111 | .add("localInterfaceId", localInterfaceId) |
112 | .add("remoteNodeId", remoteNodeId) | 112 | .add("remoteNodeId", remoteNodeId) |
113 | - .add("remoteInterfaceId:", remoteInterfaceId) | 113 | + .add("remoteInterfaceId", remoteInterfaceId) |
114 | .toString(); | 114 | .toString(); |
115 | } | 115 | } |
116 | } | 116 | } | ... | ... |
... | @@ -213,8 +213,12 @@ public class PcepObjectHeader { | ... | @@ -213,8 +213,12 @@ public class PcepObjectHeader { |
213 | 213 | ||
214 | @Override | 214 | @Override |
215 | public String toString() { | 215 | public String toString() { |
216 | - return MoreObjects.toStringHelper(getClass()).add("ObjectClass", objClass).add("ObjectType", objType) | 216 | + return MoreObjects.toStringHelper(getClass()) |
217 | - .add("ObjectLength", objLen).add("PFlag", (bPFlag) ? 1 : 0).add("IFlag", (bIFlag) ? 1 : 0) | 217 | + .add("ObjectClass", objClass) |
218 | + .add("ObjectType", objType) | ||
219 | + .add("ObjectLength", objLen) | ||
220 | + .add("PFlag", (bPFlag) ? 1 : 0) | ||
221 | + .add("IFlag", (bIFlag) ? 1 : 0) | ||
218 | .toString(); | 222 | .toString(); |
219 | } | 223 | } |
220 | } | 224 | } | ... | ... |
... | @@ -151,10 +151,10 @@ public class PcepRsvpIpv4ErrorSpec implements PcepRsvpErrorSpec { | ... | @@ -151,10 +151,10 @@ public class PcepRsvpIpv4ErrorSpec implements PcepRsvpErrorSpec { |
151 | @Override | 151 | @Override |
152 | public String toString() { | 152 | public String toString() { |
153 | return MoreObjects.toStringHelper(getClass()) | 153 | return MoreObjects.toStringHelper(getClass()) |
154 | - .add("IPv4Address:", ipv4Addr) | 154 | + .add("IPv4Address", ipv4Addr) |
155 | - .add("flags:", flags) | 155 | + .add("flags", flags) |
156 | - .add("errorCode:", errCode) | 156 | + .add("errorCode", errCode) |
157 | - .add("errorValue:", errValue) | 157 | + .add("errorValue", errValue) |
158 | .toString(); | 158 | .toString(); |
159 | } | 159 | } |
160 | } | 160 | } | ... | ... |
... | @@ -141,10 +141,10 @@ public class PcepRsvpIpv6ErrorSpec implements PcepRsvpErrorSpec { | ... | @@ -141,10 +141,10 @@ public class PcepRsvpIpv6ErrorSpec implements PcepRsvpErrorSpec { |
141 | @Override | 141 | @Override |
142 | public String toString() { | 142 | public String toString() { |
143 | return MoreObjects.toStringHelper(getClass()) | 143 | return MoreObjects.toStringHelper(getClass()) |
144 | - .add("IPv6Address:", ipv6Addr) | 144 | + .add("IPv6Address", ipv6Addr) |
145 | - .add("flags:", flags) | 145 | + .add("flags", flags) |
146 | - .add("errorCode:", errCode) | 146 | + .add("errorCode", errCode) |
147 | - .add("errorValue:", errValue) | 147 | + .add("errorValue", errValue) |
148 | .toString(); | 148 | .toString(); |
149 | } | 149 | } |
150 | } | 150 | } | ... | ... |
... | @@ -152,7 +152,10 @@ public class PcepRsvpObjectHeader { | ... | @@ -152,7 +152,10 @@ public class PcepRsvpObjectHeader { |
152 | 152 | ||
153 | @Override | 153 | @Override |
154 | public String toString() { | 154 | public String toString() { |
155 | - return MoreObjects.toStringHelper(getClass()).add("ObjectClassNum", objClassNum) | 155 | + return MoreObjects.toStringHelper(getClass()) |
156 | - .add("ObjectCType", objClassType).add("ObjectLength", objLen).toString(); | 156 | + .add("ObjectClassNum", objClassNum) |
157 | + .add("ObjectCType", objClassType) | ||
158 | + .add("ObjectLength", objLen) | ||
159 | + .toString(); | ||
157 | } | 160 | } |
158 | } | 161 | } | ... | ... |
... | @@ -147,7 +147,10 @@ public class PcepRsvpSpecObjHeader { | ... | @@ -147,7 +147,10 @@ public class PcepRsvpSpecObjHeader { |
147 | 147 | ||
148 | @Override | 148 | @Override |
149 | public String toString() { | 149 | public String toString() { |
150 | - return MoreObjects.toStringHelper(getClass()).add("ObjectClassNum: ", objClassNum) | 150 | + return MoreObjects.toStringHelper(getClass()) |
151 | - .add("ObjectCType: ", objClassType).add("ObjectLength: ", objLen).toString(); | 151 | + .add("ObjectClassNum: ", objClassNum) |
152 | + .add("ObjectCType: ", objClassType) | ||
153 | + .add("ObjectLength: ", objLen) | ||
154 | + .toString(); | ||
152 | } | 155 | } |
153 | } | 156 | } | ... | ... |
... | @@ -209,12 +209,12 @@ public class PcepRsvpUserErrorSpec implements PcepRsvpErrorSpec { | ... | @@ -209,12 +209,12 @@ public class PcepRsvpUserErrorSpec implements PcepRsvpErrorSpec { |
209 | @Override | 209 | @Override |
210 | public String toString() { | 210 | public String toString() { |
211 | return MoreObjects.toStringHelper(getClass()) | 211 | return MoreObjects.toStringHelper(getClass()) |
212 | - .add("enterpriseNumber:", enterpriseNum) | 212 | + .add("enterpriseNumber", enterpriseNum) |
213 | - .add("subOrganization:", subOrg) | 213 | + .add("subOrganization", subOrg) |
214 | - .add("errDescLength:", errDescLen) | 214 | + .add("errDescLength", errDescLen) |
215 | - .add("userErrorValue:", userErrorValue) | 215 | + .add("userErrorValue", userErrorValue) |
216 | - .add("errDesc:", errDesc) | 216 | + .add("errDesc", errDesc) |
217 | - .add("RsvpUserSpecSubObject:", llRsvpUserSpecSubObj) | 217 | + .add("RsvpUserSpecSubObject", llRsvpUserSpecSubObj) |
218 | .toString(); | 218 | .toString(); |
219 | } | 219 | } |
220 | } | 220 | } | ... | ... |
... | @@ -240,7 +240,10 @@ public class RemoteTENodeDescriptorsTlv implements PcepValueType { | ... | @@ -240,7 +240,10 @@ public class RemoteTENodeDescriptorsTlv implements PcepValueType { |
240 | 240 | ||
241 | @Override | 241 | @Override |
242 | public String toString() { | 242 | public String toString() { |
243 | - return MoreObjects.toStringHelper(getClass()).add("Type", TYPE).add("Length", hLength) | 243 | + return MoreObjects.toStringHelper(getClass()) |
244 | - .add("RemoteTeNodeDescriptorSubTLVs", llRemoteTENodeDescriptorSubTLVs).toString(); | 244 | + .add("Type", TYPE) |
245 | + .add("Length", hLength) | ||
246 | + .add("RemoteTeNodeDescriptorSubTLVs", llRemoteTENodeDescriptorSubTLVs) | ||
247 | + .toString(); | ||
245 | } | 248 | } |
246 | } | 249 | } | ... | ... |
... | @@ -138,7 +138,10 @@ public class RoutingUniverseTlv implements PcepValueType { | ... | @@ -138,7 +138,10 @@ public class RoutingUniverseTlv implements PcepValueType { |
138 | 138 | ||
139 | @Override | 139 | @Override |
140 | public String toString() { | 140 | public String toString() { |
141 | - return MoreObjects.toStringHelper(getClass()).add("Type", TYPE).add("Length", LENGTH).add("Value", rawValue) | 141 | + return MoreObjects.toStringHelper(getClass()) |
142 | + .add("Type", TYPE) | ||
143 | + .add("Length", LENGTH) | ||
144 | + .add("Value", rawValue) | ||
142 | .toString(); | 145 | .toString(); |
143 | } | 146 | } |
144 | } | 147 | } | ... | ... |
... | @@ -133,7 +133,10 @@ public class StatefulLspDbVerTlv implements PcepValueType { | ... | @@ -133,7 +133,10 @@ public class StatefulLspDbVerTlv implements PcepValueType { |
133 | 133 | ||
134 | @Override | 134 | @Override |
135 | public String toString() { | 135 | public String toString() { |
136 | - return MoreObjects.toStringHelper(getClass()).add("Type", TYPE).add("Length", LENGTH).add("Value", rawValue) | 136 | + return MoreObjects.toStringHelper(getClass()) |
137 | + .add("Type", TYPE) | ||
138 | + .add("Length", LENGTH) | ||
139 | + .add("Value", rawValue) | ||
137 | .toString(); | 140 | .toString(); |
138 | } | 141 | } |
139 | } | 142 | } | ... | ... |
... | @@ -132,7 +132,10 @@ public class StatefulLspErrorCodeTlv implements PcepValueType { | ... | @@ -132,7 +132,10 @@ public class StatefulLspErrorCodeTlv implements PcepValueType { |
132 | 132 | ||
133 | @Override | 133 | @Override |
134 | public String toString() { | 134 | public String toString() { |
135 | - return MoreObjects.toStringHelper(getClass()).add("Type", TYPE).add("Length", LENGTH).add("Value", rawValue) | 135 | + return MoreObjects.toStringHelper(getClass()) |
136 | + .add("Type", TYPE) | ||
137 | + .add("Length", LENGTH) | ||
138 | + .add("Value", rawValue) | ||
136 | .toString(); | 139 | .toString(); |
137 | } | 140 | } |
138 | 141 | ... | ... |
... | @@ -256,7 +256,14 @@ public class StatefulPceCapabilityTlv implements PcepValueType { | ... | @@ -256,7 +256,14 @@ public class StatefulPceCapabilityTlv implements PcepValueType { |
256 | 256 | ||
257 | @Override | 257 | @Override |
258 | public String toString() { | 258 | public String toString() { |
259 | - return MoreObjects.toStringHelper(getClass()).add("type", TYPE).add("Length", LENGTH).add("DFlag", bDFlag) | 259 | + return MoreObjects.toStringHelper(getClass()) |
260 | - .add("TFlag", bTFlag).add("IFlag", bIFlag).add("SFlag", bSFlag).add("UFlag", bUFlag).toString(); | 260 | + .add("type", TYPE) |
261 | + .add("Length", LENGTH) | ||
262 | + .add("DFlag", bDFlag) | ||
263 | + .add("TFlag", bTFlag) | ||
264 | + .add("IFlag", bIFlag) | ||
265 | + .add("SFlag", bSFlag) | ||
266 | + .add("UFlag", bUFlag) | ||
267 | + .toString(); | ||
261 | } | 268 | } |
262 | } | 269 | } | ... | ... |
... | @@ -25,7 +25,6 @@ import org.slf4j.Logger; | ... | @@ -25,7 +25,6 @@ import org.slf4j.Logger; |
25 | import org.slf4j.LoggerFactory; | 25 | import org.slf4j.LoggerFactory; |
26 | 26 | ||
27 | import com.google.common.base.MoreObjects; | 27 | import com.google.common.base.MoreObjects; |
28 | -import com.google.common.base.MoreObjects.ToStringHelper; | ||
29 | 28 | ||
30 | /** | 29 | /** |
31 | * Provides StatefulRsvpErrorSpecTlv. | 30 | * Provides StatefulRsvpErrorSpecTlv. |
... | @@ -207,13 +206,11 @@ public class StatefulRsvpErrorSpecTlv implements PcepValueType { | ... | @@ -207,13 +206,11 @@ public class StatefulRsvpErrorSpecTlv implements PcepValueType { |
207 | 206 | ||
208 | @Override | 207 | @Override |
209 | public String toString() { | 208 | public String toString() { |
210 | - ToStringHelper toStrHelper = MoreObjects.toStringHelper(getClass()); | 209 | + return MoreObjects.toStringHelper(getClass()) |
211 | - | 210 | + .omitNullValues() |
212 | - if (!isErrSpceObjSet) { | 211 | + .add("Type", TYPE) |
213 | - toStrHelper.add("Type", TYPE).add("Length", hLength); | 212 | + .add("Length", hLength) |
214 | - } else { | 213 | + .add("RSVPErrorSpecObject", rsvpErrSpecObj) |
215 | - toStrHelper.add("Type", TYPE).add("Length", hLength).add("RSVPErrorSpecObject", rsvpErrSpecObj); | 214 | + .toString(); |
216 | - } | ||
217 | - return toStrHelper.toString(); | ||
218 | } | 215 | } |
219 | } | 216 | } | ... | ... |
... | @@ -152,6 +152,8 @@ public class SymbolicPathNameTlv implements PcepValueType { | ... | @@ -152,6 +152,8 @@ public class SymbolicPathNameTlv implements PcepValueType { |
152 | 152 | ||
153 | @Override | 153 | @Override |
154 | public String toString() { | 154 | public String toString() { |
155 | - return MoreObjects.toStringHelper(getClass()).add("SymbolicPathName ", rawValue).toString(); | 155 | + return MoreObjects.toStringHelper(getClass()) |
156 | + .add("SymbolicPathName ", rawValue) | ||
157 | + .toString(); | ||
156 | } | 158 | } |
157 | } | 159 | } | ... | ... |
... | @@ -128,7 +128,10 @@ public class TEDefaultMetricTlv implements PcepValueType { | ... | @@ -128,7 +128,10 @@ public class TEDefaultMetricTlv implements PcepValueType { |
128 | 128 | ||
129 | @Override | 129 | @Override |
130 | public String toString() { | 130 | public String toString() { |
131 | - return MoreObjects.toStringHelper(getClass()).add("Type", TYPE).add("Length", LENGTH).add("Value", rawValue) | 131 | + return MoreObjects.toStringHelper(getClass()) |
132 | + .add("Type", TYPE) | ||
133 | + .add("Length", LENGTH) | ||
134 | + .add("Value", rawValue) | ||
132 | .toString(); | 135 | .toString(); |
133 | } | 136 | } |
134 | } | 137 | } | ... | ... |
... | @@ -283,7 +283,10 @@ public class TELinkAttributesTlv implements PcepValueType { | ... | @@ -283,7 +283,10 @@ public class TELinkAttributesTlv implements PcepValueType { |
283 | 283 | ||
284 | @Override | 284 | @Override |
285 | public String toString() { | 285 | public String toString() { |
286 | - return MoreObjects.toStringHelper(getClass()).add("Type", TYPE).add("Length", hLength) | 286 | + return MoreObjects.toStringHelper(getClass()) |
287 | - .add("LinkAttributesSubTLVs", llLinkAttributesSubTLVs).toString(); | 287 | + .add("Type", TYPE) |
288 | + .add("Length", hLength) | ||
289 | + .add("LinkAttributesSubTLVs", llLinkAttributesSubTLVs) | ||
290 | + .toString(); | ||
288 | } | 291 | } |
289 | } | 292 | } | ... | ... |
... | @@ -242,7 +242,10 @@ public class TELinkDescriptorsTlv implements PcepValueType { | ... | @@ -242,7 +242,10 @@ public class TELinkDescriptorsTlv implements PcepValueType { |
242 | 242 | ||
243 | @Override | 243 | @Override |
244 | public String toString() { | 244 | public String toString() { |
245 | - return MoreObjects.toStringHelper(getClass()).add("Type", TYPE).add("Length", hLength) | 245 | + return MoreObjects.toStringHelper(getClass()) |
246 | - .add("LinkDescriptorsSubTLVs", llLinkDescriptorsSubTLVs).toString(); | 246 | + .add("Type", TYPE) |
247 | + .add("Length", hLength) | ||
248 | + .add("LinkDescriptorsSubTLVs", llLinkDescriptorsSubTLVs) | ||
249 | + .toString(); | ||
247 | } | 250 | } |
248 | } | 251 | } | ... | ... |
... | @@ -241,7 +241,10 @@ public class TENodeAttributesTlv implements PcepValueType { | ... | @@ -241,7 +241,10 @@ public class TENodeAttributesTlv implements PcepValueType { |
241 | 241 | ||
242 | @Override | 242 | @Override |
243 | public String toString() { | 243 | public String toString() { |
244 | - return MoreObjects.toStringHelper(getClass()).add("Type", TYPE).add("Length", hLength) | 244 | + return MoreObjects.toStringHelper(getClass()) |
245 | - .add("NodeAttributesSubTLVs", llNodeAttributesSubTLVs).toString(); | 245 | + .add("Type", TYPE) |
246 | + .add("Length", hLength) | ||
247 | + .add("NodeAttributesSubTLVs", llNodeAttributesSubTLVs) | ||
248 | + .toString(); | ||
246 | } | 249 | } |
247 | } | 250 | } | ... | ... |
... | @@ -172,7 +172,10 @@ public class TedCapabilityTlv implements PcepValueType { | ... | @@ -172,7 +172,10 @@ public class TedCapabilityTlv implements PcepValueType { |
172 | 172 | ||
173 | @Override | 173 | @Override |
174 | public String toString() { | 174 | public String toString() { |
175 | - return MoreObjects.toStringHelper(getClass()).add("Type", TYPE).add("Length", LENGTH).add("Value", rawValue) | 175 | + return MoreObjects.toStringHelper(getClass()) |
176 | + .add("Type", TYPE) | ||
177 | + .add("Length", LENGTH) | ||
178 | + .add("Value", rawValue) | ||
176 | .toString(); | 179 | .toString(); |
177 | } | 180 | } |
178 | } | 181 | } | ... | ... |
... | @@ -127,7 +127,10 @@ public class UnreservedBandwidthTlv implements PcepValueType { | ... | @@ -127,7 +127,10 @@ public class UnreservedBandwidthTlv implements PcepValueType { |
127 | 127 | ||
128 | @Override | 128 | @Override |
129 | public String toString() { | 129 | public String toString() { |
130 | - return MoreObjects.toStringHelper(getClass()).add("Type", TYPE).add("Length", LENGTH).add("Value", rawValue) | 130 | + return MoreObjects.toStringHelper(getClass()) |
131 | + .add("Type", TYPE) | ||
132 | + .add("Length", LENGTH) | ||
133 | + .add("Value", rawValue) | ||
131 | .toString(); | 134 | .toString(); |
132 | } | 135 | } |
133 | } | 136 | } | ... | ... |
-
Please register or login to post a comment