홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Priyanka B
Committed by Gerrit Code Review
e9ed7296 1 parent f215b0cf

[ONOS-2602] use of Constants variables 

Change-Id: I22dd05c5b5c1ac99edce106ab43b00e4b333c177
Inline Side-by-side
Showing 4 changed files with 13 additions and 24 deletions
...@@ -21,6 +21,7 @@ import java.util.Objects; ...@@ -21,6 +21,7 @@ import java.util.Objects;
21 21
22 import org.jboss.netty.buffer.ChannelBuffer; 22 import org.jboss.netty.buffer.ChannelBuffer;
23 import org.onosproject.bgpio.exceptions.BGPParseException; 23 import org.onosproject.bgpio.exceptions.BGPParseException;
24 +import org.onosproject.bgpio.util.Constants;
24 import org.onosproject.bgpio.util.Validation; 25 import org.onosproject.bgpio.util.Validation;
25 import org.slf4j.Logger; 26 import org.slf4j.Logger;
26 import org.slf4j.LoggerFactory; 27 import org.slf4j.LoggerFactory;
...@@ -34,8 +35,6 @@ public class As4Path implements BGPValueType { ...@@ -34,8 +35,6 @@ public class As4Path implements BGPValueType {
34 private static final Logger log = LoggerFactory.getLogger(AsPath.class); 35 private static final Logger log = LoggerFactory.getLogger(AsPath.class);
35 public static final byte AS4PATH_TYPE = 17; 36 public static final byte AS4PATH_TYPE = 17;
36 public static final byte ASNUM_SIZE = 4; 37 public static final byte ASNUM_SIZE = 4;
37 - public static final int TYPE_AND_LEN_AS_SHORT = 4;
38 - public static final int TYPE_AND_LEN_AS_BYTE = 3;
39 38
40 private List<Integer> as4pathSet; 39 private List<Integer> as4pathSet;
41 private List<Integer> as4pathSeq; 40 private List<Integer> as4pathSeq;
...@@ -77,8 +76,8 @@ public class As4Path implements BGPValueType { ...@@ -77,8 +76,8 @@ public class As4Path implements BGPValueType {
77 validation.getLength()); 76 validation.getLength());
78 } 77 }
79 //if fourth bit is set length is read as short otherwise as byte , len includes type, length and value 78 //if fourth bit is set length is read as short otherwise as byte , len includes type, length and value
80 - int len = validation.isShort() ? validation.getLength() + TYPE_AND_LEN_AS_SHORT : validation 79 + int len = validation.isShort() ? validation.getLength() + Constants.TYPE_AND_LEN_AS_SHORT : validation
81 - .getLength() + TYPE_AND_LEN_AS_BYTE; 80 + .getLength() + Constants.TYPE_AND_LEN_AS_BYTE;
82 ChannelBuffer data = tempCb.readBytes(len); 81 ChannelBuffer data = tempCb.readBytes(len);
83 if (validation.getFirstBit() && !validation.getSecondBit() && validation.getThirdBit()) { 82 if (validation.getFirstBit() && !validation.getSecondBit() && validation.getThirdBit()) {
84 throw new BGPParseException(BGPErrorType.UPDATE_MESSAGE_ERROR, BGPErrorType.ATTRIBUTE_FLAGS_ERROR, data); 83 throw new BGPParseException(BGPErrorType.UPDATE_MESSAGE_ERROR, BGPErrorType.ATTRIBUTE_FLAGS_ERROR, data);
......
...@@ -22,6 +22,7 @@ import java.util.Objects; ...@@ -22,6 +22,7 @@ import java.util.Objects;
22 22
23 import org.jboss.netty.buffer.ChannelBuffer; 23 import org.jboss.netty.buffer.ChannelBuffer;
24 import org.onosproject.bgpio.exceptions.BGPParseException; 24 import org.onosproject.bgpio.exceptions.BGPParseException;
25 +import org.onosproject.bgpio.util.Constants;
25 import org.onosproject.bgpio.util.Validation; 26 import org.onosproject.bgpio.util.Validation;
26 import org.slf4j.Logger; 27 import org.slf4j.Logger;
27 import org.slf4j.LoggerFactory; 28 import org.slf4j.LoggerFactory;
...@@ -53,7 +54,7 @@ public class AsPath implements BGPValueType { ...@@ -53,7 +54,7 @@ public class AsPath implements BGPValueType {
53 * 54 *
54 * @return AS type 55 * @return AS type
55 */ 56 */
56 - public byte getType() { 57 + public byte type() {
57 return (byte) value; 58 return (byte) value;
58 } 59 }
59 } 60 }
...@@ -63,8 +64,6 @@ public class AsPath implements BGPValueType { ...@@ -63,8 +64,6 @@ public class AsPath implements BGPValueType {
63 public static final byte ASPATH_SET_TYPE = 1; 64 public static final byte ASPATH_SET_TYPE = 1;
64 public static final byte ASPATH_SEQ_TYPE = 2; 65 public static final byte ASPATH_SEQ_TYPE = 2;
65 public static final byte ASNUM_SIZE = 2; 66 public static final byte ASNUM_SIZE = 2;
66 - public static final int TYPE_AND_LEN_AS_SHORT = 4;
67 - public static final int TYPE_AND_LEN_AS_BYTE = 3;
68 67
69 private boolean isAsPath = false; 68 private boolean isAsPath = false;
70 private List<Short> aspathSet; 69 private List<Short> aspathSet;
...@@ -108,8 +107,8 @@ public class AsPath implements BGPValueType { ...@@ -108,8 +107,8 @@ public class AsPath implements BGPValueType {
108 validation.getLength()); 107 validation.getLength());
109 } 108 }
110 //if fourth bit is set, length is read as short otherwise as byte , len includes type, length and value 109 //if fourth bit is set, length is read as short otherwise as byte , len includes type, length and value
111 - int len = validation.isShort() ? validation.getLength() + TYPE_AND_LEN_AS_SHORT : validation 110 + int len = validation.isShort() ? validation.getLength() + Constants.TYPE_AND_LEN_AS_SHORT : validation
112 - .getLength() + TYPE_AND_LEN_AS_BYTE; 111 + .getLength() + Constants.TYPE_AND_LEN_AS_BYTE;
113 ChannelBuffer data = tempCb.readBytes(len); 112 ChannelBuffer data = tempCb.readBytes(len);
114 if (validation.getFirstBit() && !validation.getSecondBit() && validation.getThirdBit()) { 113 if (validation.getFirstBit() && !validation.getSecondBit() && validation.getThirdBit()) {
115 throw new BGPParseException(BGPErrorType.UPDATE_MESSAGE_ERROR, BGPErrorType.ATTRIBUTE_FLAGS_ERROR, data); 114 throw new BGPParseException(BGPErrorType.UPDATE_MESSAGE_ERROR, BGPErrorType.ATTRIBUTE_FLAGS_ERROR, data);
......
...@@ -19,9 +19,8 @@ import java.util.Objects; ...@@ -19,9 +19,8 @@ import java.util.Objects;
19 19
20 import org.jboss.netty.buffer.ChannelBuffer; 20 import org.jboss.netty.buffer.ChannelBuffer;
21 import org.onosproject.bgpio.exceptions.BGPParseException; 21 import org.onosproject.bgpio.exceptions.BGPParseException;
22 +import org.onosproject.bgpio.util.Constants;
22 import org.onosproject.bgpio.util.Validation; 23 import org.onosproject.bgpio.util.Validation;
23 -import org.slf4j.Logger;
24 -import org.slf4j.LoggerFactory;
25 24
26 import com.google.common.base.MoreObjects; 25 import com.google.common.base.MoreObjects;
27 26
...@@ -29,11 +28,7 @@ import com.google.common.base.MoreObjects; ...@@ -29,11 +28,7 @@ import com.google.common.base.MoreObjects;
29 * Provides implementation of LocalPref BGP Path Attribute. 28 * Provides implementation of LocalPref BGP Path Attribute.
30 */ 29 */
31 public class LocalPref implements BGPValueType { 30 public class LocalPref implements BGPValueType {
32 -
33 - private static final Logger log = LoggerFactory.getLogger(LocalPref.class);
34 public static final byte LOCAL_PREF_TYPE = 5; 31 public static final byte LOCAL_PREF_TYPE = 5;
35 - public static final int TYPE_AND_LEN_AS_SHORT = 4;
36 - public static final int TYPE_AND_LEN_AS_BYTE = 3;
37 public static final byte LOCAL_PREF_MAX_LEN = 4; 32 public static final byte LOCAL_PREF_MAX_LEN = 4;
38 33
39 private int localPref; 34 private int localPref;
...@@ -72,8 +67,8 @@ public class LocalPref implements BGPValueType { ...@@ -72,8 +67,8 @@ public class LocalPref implements BGPValueType {
72 parseFlags.getLength()); 67 parseFlags.getLength());
73 } 68 }
74 69
75 - int len = parseFlags.isShort() ? parseFlags.getLength() + TYPE_AND_LEN_AS_SHORT : parseFlags.getLength() 70 + int len = parseFlags.isShort() ? parseFlags.getLength() +
76 - + TYPE_AND_LEN_AS_BYTE; 71 + Constants.TYPE_AND_LEN_AS_SHORT : parseFlags.getLength() + Constants.TYPE_AND_LEN_AS_BYTE;
77 ChannelBuffer data = tempCb.readBytes(len); 72 ChannelBuffer data = tempCb.readBytes(len);
78 if (parseFlags.getFirstBit()) { 73 if (parseFlags.getFirstBit()) {
79 throw new BGPParseException(BGPErrorType.UPDATE_MESSAGE_ERROR, BGPErrorType.ATTRIBUTE_FLAGS_ERROR, data); 74 throw new BGPParseException(BGPErrorType.UPDATE_MESSAGE_ERROR, BGPErrorType.ATTRIBUTE_FLAGS_ERROR, data);
......
...@@ -19,9 +19,8 @@ import java.util.Objects; ...@@ -19,9 +19,8 @@ import java.util.Objects;
19 19
20 import org.jboss.netty.buffer.ChannelBuffer; 20 import org.jboss.netty.buffer.ChannelBuffer;
21 import org.onosproject.bgpio.exceptions.BGPParseException; 21 import org.onosproject.bgpio.exceptions.BGPParseException;
22 +import org.onosproject.bgpio.util.Constants;
22 import org.onosproject.bgpio.util.Validation; 23 import org.onosproject.bgpio.util.Validation;
23 -import org.slf4j.Logger;
24 -import org.slf4j.LoggerFactory;
25 24
26 import com.google.common.base.MoreObjects; 25 import com.google.common.base.MoreObjects;
27 26
...@@ -29,10 +28,7 @@ import com.google.common.base.MoreObjects; ...@@ -29,10 +28,7 @@ import com.google.common.base.MoreObjects;
29 * Provides Implementation of Med BGP Path Attribute. 28 * Provides Implementation of Med BGP Path Attribute.
30 */ 29 */
31 public class Med implements BGPValueType { 30 public class Med implements BGPValueType {
32 - private static final Logger log = LoggerFactory.getLogger(Med.class);
33 public static final byte MED_TYPE = 4; 31 public static final byte MED_TYPE = 4;
34 - public static final int TYPE_AND_LEN_AS_SHORT = 4;
35 - public static final int TYPE_AND_LEN_AS_BYTE = 3;
36 public static final byte MED_MAX_LEN = 4; 32 public static final byte MED_MAX_LEN = 4;
37 33
38 private int med; 34 private int med;
...@@ -71,8 +67,8 @@ public class Med implements BGPValueType { ...@@ -71,8 +67,8 @@ public class Med implements BGPValueType {
71 Validation.validateLen(BGPErrorType.UPDATE_MESSAGE_ERROR, BGPErrorType.ATTRIBUTE_LENGTH_ERROR, 67 Validation.validateLen(BGPErrorType.UPDATE_MESSAGE_ERROR, BGPErrorType.ATTRIBUTE_LENGTH_ERROR,
72 parseFlags.getLength()); 68 parseFlags.getLength());
73 } 69 }
74 - int len = parseFlags.isShort() ? parseFlags.getLength() + TYPE_AND_LEN_AS_SHORT : parseFlags 70 + int len = parseFlags.isShort() ? parseFlags.getLength() + Constants.TYPE_AND_LEN_AS_SHORT : parseFlags
75 - .getLength() + TYPE_AND_LEN_AS_BYTE; 71 + .getLength() + Constants.TYPE_AND_LEN_AS_BYTE;
76 ChannelBuffer data = tempCb.readBytes(len); 72 ChannelBuffer data = tempCb.readBytes(len);
77 if (!parseFlags.getFirstBit() && parseFlags.getSecondBit() && parseFlags.getThirdBit()) { 73 if (!parseFlags.getFirstBit() && parseFlags.getSecondBit() && parseFlags.getThirdBit()) {
78 throw new BGPParseException(BGPErrorType.UPDATE_MESSAGE_ERROR, BGPErrorType.ATTRIBUTE_FLAGS_ERROR, data); 74 throw new BGPParseException(BGPErrorType.UPDATE_MESSAGE_ERROR, BGPErrorType.ATTRIBUTE_FLAGS_ERROR, data);
......