Committed by
Gerrit Code Review
Remove "public" from TrafficSelector definition to follow our convention
Change-Id: Ie6146c66bf1585970ef884bc6615d030510d5a87
Showing
1 changed file
with
34 additions
and
34 deletions
... | @@ -49,7 +49,7 @@ public interface TrafficSelector { | ... | @@ -49,7 +49,7 @@ public interface TrafficSelector { |
49 | /** | 49 | /** |
50 | * Builder of traffic selector entities. | 50 | * Builder of traffic selector entities. |
51 | */ | 51 | */ |
52 | - public interface Builder { | 52 | + interface Builder { |
53 | 53 | ||
54 | /** | 54 | /** |
55 | * Adds a traffic selection criterion. If a same type criterion has | 55 | * Adds a traffic selection criterion. If a same type criterion has |
... | @@ -66,7 +66,7 @@ public interface TrafficSelector { | ... | @@ -66,7 +66,7 @@ public interface TrafficSelector { |
66 | * @param port the inport | 66 | * @param port the inport |
67 | * @return a selection builder | 67 | * @return a selection builder |
68 | */ | 68 | */ |
69 | - public Builder matchInPort(PortNumber port); | 69 | + Builder matchInPort(PortNumber port); |
70 | 70 | ||
71 | /** | 71 | /** |
72 | * Matches a physical inport. | 72 | * Matches a physical inport. |
... | @@ -74,7 +74,7 @@ public interface TrafficSelector { | ... | @@ -74,7 +74,7 @@ public interface TrafficSelector { |
74 | * @param port the physical inport | 74 | * @param port the physical inport |
75 | * @return a selection builder | 75 | * @return a selection builder |
76 | */ | 76 | */ |
77 | - public Builder matchInPhyPort(PortNumber port); | 77 | + Builder matchInPhyPort(PortNumber port); |
78 | 78 | ||
79 | /** | 79 | /** |
80 | * Matches a metadata. | 80 | * Matches a metadata. |
... | @@ -82,7 +82,7 @@ public interface TrafficSelector { | ... | @@ -82,7 +82,7 @@ public interface TrafficSelector { |
82 | * @param metadata the metadata | 82 | * @param metadata the metadata |
83 | * @return a selection builder | 83 | * @return a selection builder |
84 | */ | 84 | */ |
85 | - public Builder matchMetadata(long metadata); | 85 | + Builder matchMetadata(long metadata); |
86 | 86 | ||
87 | /** | 87 | /** |
88 | * Matches a l2 dst address. | 88 | * Matches a l2 dst address. |
... | @@ -90,7 +90,7 @@ public interface TrafficSelector { | ... | @@ -90,7 +90,7 @@ public interface TrafficSelector { |
90 | * @param addr a l2 address | 90 | * @param addr a l2 address |
91 | * @return a selection builder | 91 | * @return a selection builder |
92 | */ | 92 | */ |
93 | - public Builder matchEthDst(MacAddress addr); | 93 | + Builder matchEthDst(MacAddress addr); |
94 | 94 | ||
95 | /** | 95 | /** |
96 | * Matches a l2 src address. | 96 | * Matches a l2 src address. |
... | @@ -98,7 +98,7 @@ public interface TrafficSelector { | ... | @@ -98,7 +98,7 @@ public interface TrafficSelector { |
98 | * @param addr a l2 address | 98 | * @param addr a l2 address |
99 | * @return a selection builder | 99 | * @return a selection builder |
100 | */ | 100 | */ |
101 | - public Builder matchEthSrc(MacAddress addr); | 101 | + Builder matchEthSrc(MacAddress addr); |
102 | 102 | ||
103 | /** | 103 | /** |
104 | * Matches the ethernet type. | 104 | * Matches the ethernet type. |
... | @@ -106,7 +106,7 @@ public interface TrafficSelector { | ... | @@ -106,7 +106,7 @@ public interface TrafficSelector { |
106 | * @param ethType an ethernet type | 106 | * @param ethType an ethernet type |
107 | * @return a selection builder | 107 | * @return a selection builder |
108 | */ | 108 | */ |
109 | - public Builder matchEthType(short ethType); | 109 | + Builder matchEthType(short ethType); |
110 | 110 | ||
111 | /** | 111 | /** |
112 | * Matches the vlan id. | 112 | * Matches the vlan id. |
... | @@ -114,7 +114,7 @@ public interface TrafficSelector { | ... | @@ -114,7 +114,7 @@ public interface TrafficSelector { |
114 | * @param vlanId a vlan id | 114 | * @param vlanId a vlan id |
115 | * @return a selection builder | 115 | * @return a selection builder |
116 | */ | 116 | */ |
117 | - public Builder matchVlanId(VlanId vlanId); | 117 | + Builder matchVlanId(VlanId vlanId); |
118 | 118 | ||
119 | /** | 119 | /** |
120 | * Matches a vlan priority. | 120 | * Matches a vlan priority. |
... | @@ -122,7 +122,7 @@ public interface TrafficSelector { | ... | @@ -122,7 +122,7 @@ public interface TrafficSelector { |
122 | * @param vlanPcp a vlan priority | 122 | * @param vlanPcp a vlan priority |
123 | * @return a selection builder | 123 | * @return a selection builder |
124 | */ | 124 | */ |
125 | - public Builder matchVlanPcp(byte vlanPcp); | 125 | + Builder matchVlanPcp(byte vlanPcp); |
126 | 126 | ||
127 | /** | 127 | /** |
128 | * Matches an IP DSCP (6 bits in ToS field). | 128 | * Matches an IP DSCP (6 bits in ToS field). |
... | @@ -130,7 +130,7 @@ public interface TrafficSelector { | ... | @@ -130,7 +130,7 @@ public interface TrafficSelector { |
130 | * @param ipDscp an IP DSCP value | 130 | * @param ipDscp an IP DSCP value |
131 | * @return a selection builder | 131 | * @return a selection builder |
132 | */ | 132 | */ |
133 | - public Builder matchIPDscp(byte ipDscp); | 133 | + Builder matchIPDscp(byte ipDscp); |
134 | 134 | ||
135 | /** | 135 | /** |
136 | * Matches an IP ECN (2 bits in ToS field). | 136 | * Matches an IP ECN (2 bits in ToS field). |
... | @@ -138,7 +138,7 @@ public interface TrafficSelector { | ... | @@ -138,7 +138,7 @@ public interface TrafficSelector { |
138 | * @param ipEcn an IP ECN value | 138 | * @param ipEcn an IP ECN value |
139 | * @return a selection builder | 139 | * @return a selection builder |
140 | */ | 140 | */ |
141 | - public Builder matchIPEcn(byte ipEcn); | 141 | + Builder matchIPEcn(byte ipEcn); |
142 | 142 | ||
143 | /** | 143 | /** |
144 | * Matches the l3 protocol. | 144 | * Matches the l3 protocol. |
... | @@ -146,7 +146,7 @@ public interface TrafficSelector { | ... | @@ -146,7 +146,7 @@ public interface TrafficSelector { |
146 | * @param proto a l3 protocol | 146 | * @param proto a l3 protocol |
147 | * @return a selection builder | 147 | * @return a selection builder |
148 | */ | 148 | */ |
149 | - public Builder matchIPProtocol(byte proto); | 149 | + Builder matchIPProtocol(byte proto); |
150 | 150 | ||
151 | /** | 151 | /** |
152 | * Matches a l3 IPv4 address. | 152 | * Matches a l3 IPv4 address. |
... | @@ -154,7 +154,7 @@ public interface TrafficSelector { | ... | @@ -154,7 +154,7 @@ public interface TrafficSelector { |
154 | * @param ip a l3 address | 154 | * @param ip a l3 address |
155 | * @return a selection builder | 155 | * @return a selection builder |
156 | */ | 156 | */ |
157 | - public Builder matchIPSrc(IpPrefix ip); | 157 | + Builder matchIPSrc(IpPrefix ip); |
158 | 158 | ||
159 | /** | 159 | /** |
160 | * Matches a l3 IPv4 address. | 160 | * Matches a l3 IPv4 address. |
... | @@ -162,7 +162,7 @@ public interface TrafficSelector { | ... | @@ -162,7 +162,7 @@ public interface TrafficSelector { |
162 | * @param ip a l3 address | 162 | * @param ip a l3 address |
163 | * @return a selection builder | 163 | * @return a selection builder |
164 | */ | 164 | */ |
165 | - public Builder matchIPDst(IpPrefix ip); | 165 | + Builder matchIPDst(IpPrefix ip); |
166 | 166 | ||
167 | /** | 167 | /** |
168 | * Matches a TCP source port number. | 168 | * Matches a TCP source port number. |
... | @@ -170,7 +170,7 @@ public interface TrafficSelector { | ... | @@ -170,7 +170,7 @@ public interface TrafficSelector { |
170 | * @param tcpPort a TCP source port number | 170 | * @param tcpPort a TCP source port number |
171 | * @return a selection builder | 171 | * @return a selection builder |
172 | */ | 172 | */ |
173 | - public Builder matchTcpSrc(short tcpPort); | 173 | + Builder matchTcpSrc(short tcpPort); |
174 | 174 | ||
175 | /** | 175 | /** |
176 | * Matches a TCP destination port number. | 176 | * Matches a TCP destination port number. |
... | @@ -178,7 +178,7 @@ public interface TrafficSelector { | ... | @@ -178,7 +178,7 @@ public interface TrafficSelector { |
178 | * @param tcpPort a TCP destination port number | 178 | * @param tcpPort a TCP destination port number |
179 | * @return a selection builder | 179 | * @return a selection builder |
180 | */ | 180 | */ |
181 | - public Builder matchTcpDst(short tcpPort); | 181 | + Builder matchTcpDst(short tcpPort); |
182 | 182 | ||
183 | /** | 183 | /** |
184 | * Matches an UDP source port number. | 184 | * Matches an UDP source port number. |
... | @@ -186,7 +186,7 @@ public interface TrafficSelector { | ... | @@ -186,7 +186,7 @@ public interface TrafficSelector { |
186 | * @param udpPort an UDP source port number | 186 | * @param udpPort an UDP source port number |
187 | * @return a selection builder | 187 | * @return a selection builder |
188 | */ | 188 | */ |
189 | - public Builder matchUdpSrc(short udpPort); | 189 | + Builder matchUdpSrc(short udpPort); |
190 | 190 | ||
191 | /** | 191 | /** |
192 | * Matches an UDP destination port number. | 192 | * Matches an UDP destination port number. |
... | @@ -194,7 +194,7 @@ public interface TrafficSelector { | ... | @@ -194,7 +194,7 @@ public interface TrafficSelector { |
194 | * @param udpPort an UDP destination port number | 194 | * @param udpPort an UDP destination port number |
195 | * @return a selection builder | 195 | * @return a selection builder |
196 | */ | 196 | */ |
197 | - public Builder matchUdpDst(short udpPort); | 197 | + Builder matchUdpDst(short udpPort); |
198 | 198 | ||
199 | /** | 199 | /** |
200 | * Matches a SCTP source port number. | 200 | * Matches a SCTP source port number. |
... | @@ -202,7 +202,7 @@ public interface TrafficSelector { | ... | @@ -202,7 +202,7 @@ public interface TrafficSelector { |
202 | * @param sctpPort a SCTP source port number | 202 | * @param sctpPort a SCTP source port number |
203 | * @return a selection builder | 203 | * @return a selection builder |
204 | */ | 204 | */ |
205 | - public Builder matchSctpSrc(short sctpPort); | 205 | + Builder matchSctpSrc(short sctpPort); |
206 | 206 | ||
207 | /** | 207 | /** |
208 | * Matches a SCTP destination port number. | 208 | * Matches a SCTP destination port number. |
... | @@ -210,7 +210,7 @@ public interface TrafficSelector { | ... | @@ -210,7 +210,7 @@ public interface TrafficSelector { |
210 | * @param sctpPort a SCTP destination port number | 210 | * @param sctpPort a SCTP destination port number |
211 | * @return a selection builder | 211 | * @return a selection builder |
212 | */ | 212 | */ |
213 | - public Builder matchSctpDst(short sctpPort); | 213 | + Builder matchSctpDst(short sctpPort); |
214 | 214 | ||
215 | /** | 215 | /** |
216 | * Matches an ICMP type. | 216 | * Matches an ICMP type. |
... | @@ -218,7 +218,7 @@ public interface TrafficSelector { | ... | @@ -218,7 +218,7 @@ public interface TrafficSelector { |
218 | * @param icmpType an ICMP type | 218 | * @param icmpType an ICMP type |
219 | * @return a selection builder | 219 | * @return a selection builder |
220 | */ | 220 | */ |
221 | - public Builder matchIcmpType(byte icmpType); | 221 | + Builder matchIcmpType(byte icmpType); |
222 | 222 | ||
223 | /** | 223 | /** |
224 | * Matches an ICMP code. | 224 | * Matches an ICMP code. |
... | @@ -226,7 +226,7 @@ public interface TrafficSelector { | ... | @@ -226,7 +226,7 @@ public interface TrafficSelector { |
226 | * @param icmpCode an ICMP code | 226 | * @param icmpCode an ICMP code |
227 | * @return a selection builder | 227 | * @return a selection builder |
228 | */ | 228 | */ |
229 | - public Builder matchIcmpCode(byte icmpCode); | 229 | + Builder matchIcmpCode(byte icmpCode); |
230 | 230 | ||
231 | /** | 231 | /** |
232 | * Matches a l3 IPv6 address. | 232 | * Matches a l3 IPv6 address. |
... | @@ -234,7 +234,7 @@ public interface TrafficSelector { | ... | @@ -234,7 +234,7 @@ public interface TrafficSelector { |
234 | * @param ip a l3 IPv6 address | 234 | * @param ip a l3 IPv6 address |
235 | * @return a selection builder | 235 | * @return a selection builder |
236 | */ | 236 | */ |
237 | - public Builder matchIPv6Src(IpPrefix ip); | 237 | + Builder matchIPv6Src(IpPrefix ip); |
238 | 238 | ||
239 | /** | 239 | /** |
240 | * Matches a l3 IPv6 address. | 240 | * Matches a l3 IPv6 address. |
... | @@ -242,7 +242,7 @@ public interface TrafficSelector { | ... | @@ -242,7 +242,7 @@ public interface TrafficSelector { |
242 | * @param ip a l3 IPv6 address | 242 | * @param ip a l3 IPv6 address |
243 | * @return a selection builder | 243 | * @return a selection builder |
244 | */ | 244 | */ |
245 | - public Builder matchIPv6Dst(IpPrefix ip); | 245 | + Builder matchIPv6Dst(IpPrefix ip); |
246 | 246 | ||
247 | /** | 247 | /** |
248 | * Matches an IPv6 flow label. | 248 | * Matches an IPv6 flow label. |
... | @@ -250,7 +250,7 @@ public interface TrafficSelector { | ... | @@ -250,7 +250,7 @@ public interface TrafficSelector { |
250 | * @param flowLabel an IPv6 flow label | 250 | * @param flowLabel an IPv6 flow label |
251 | * @return a selection builder | 251 | * @return a selection builder |
252 | */ | 252 | */ |
253 | - public Builder matchIPv6FlowLabel(int flowLabel); | 253 | + Builder matchIPv6FlowLabel(int flowLabel); |
254 | 254 | ||
255 | /** | 255 | /** |
256 | * Matches an ICMPv6 type. | 256 | * Matches an ICMPv6 type. |
... | @@ -258,7 +258,7 @@ public interface TrafficSelector { | ... | @@ -258,7 +258,7 @@ public interface TrafficSelector { |
258 | * @param icmpv6Type an ICMPv6 type | 258 | * @param icmpv6Type an ICMPv6 type |
259 | * @return a selection builder | 259 | * @return a selection builder |
260 | */ | 260 | */ |
261 | - public Builder matchIcmpv6Type(byte icmpv6Type); | 261 | + Builder matchIcmpv6Type(byte icmpv6Type); |
262 | 262 | ||
263 | /** | 263 | /** |
264 | * Matches an ICMPv6 code. | 264 | * Matches an ICMPv6 code. |
... | @@ -266,7 +266,7 @@ public interface TrafficSelector { | ... | @@ -266,7 +266,7 @@ public interface TrafficSelector { |
266 | * @param icmpv6Code an ICMPv6 code | 266 | * @param icmpv6Code an ICMPv6 code |
267 | * @return a selection builder | 267 | * @return a selection builder |
268 | */ | 268 | */ |
269 | - public Builder matchIcmpv6Code(byte icmpv6Code); | 269 | + Builder matchIcmpv6Code(byte icmpv6Code); |
270 | 270 | ||
271 | /** | 271 | /** |
272 | * Matches an IPv6 Neighbor Discovery target address. | 272 | * Matches an IPv6 Neighbor Discovery target address. |
... | @@ -274,7 +274,7 @@ public interface TrafficSelector { | ... | @@ -274,7 +274,7 @@ public interface TrafficSelector { |
274 | * @param targetAddress an IPv6 Neighbor Discovery target address | 274 | * @param targetAddress an IPv6 Neighbor Discovery target address |
275 | * @return a selection builder | 275 | * @return a selection builder |
276 | */ | 276 | */ |
277 | - public Builder matchIPv6NDTargetAddress(Ip6Address targetAddress); | 277 | + Builder matchIPv6NDTargetAddress(Ip6Address targetAddress); |
278 | 278 | ||
279 | /** | 279 | /** |
280 | * Matches an IPv6 Neighbor Discovery source link-layer address. | 280 | * Matches an IPv6 Neighbor Discovery source link-layer address. |
... | @@ -282,7 +282,7 @@ public interface TrafficSelector { | ... | @@ -282,7 +282,7 @@ public interface TrafficSelector { |
282 | * @param mac an IPv6 Neighbor Discovery source link-layer address | 282 | * @param mac an IPv6 Neighbor Discovery source link-layer address |
283 | * @return a selection builder | 283 | * @return a selection builder |
284 | */ | 284 | */ |
285 | - public Builder matchIPv6NDSourceLinkLayerAddress(MacAddress mac); | 285 | + Builder matchIPv6NDSourceLinkLayerAddress(MacAddress mac); |
286 | 286 | ||
287 | /** | 287 | /** |
288 | * Matches an IPv6 Neighbor Discovery target link-layer address. | 288 | * Matches an IPv6 Neighbor Discovery target link-layer address. |
... | @@ -290,7 +290,7 @@ public interface TrafficSelector { | ... | @@ -290,7 +290,7 @@ public interface TrafficSelector { |
290 | * @param mac an IPv6 Neighbor Discovery target link-layer address | 290 | * @param mac an IPv6 Neighbor Discovery target link-layer address |
291 | * @return a selection builder | 291 | * @return a selection builder |
292 | */ | 292 | */ |
293 | - public Builder matchIPv6NDTargetLinkLayerAddress(MacAddress mac); | 293 | + Builder matchIPv6NDTargetLinkLayerAddress(MacAddress mac); |
294 | 294 | ||
295 | /** | 295 | /** |
296 | * Matches on a MPLS label. | 296 | * Matches on a MPLS label. |
... | @@ -298,7 +298,7 @@ public interface TrafficSelector { | ... | @@ -298,7 +298,7 @@ public interface TrafficSelector { |
298 | * @param mplsLabel a MPLS label. | 298 | * @param mplsLabel a MPLS label. |
299 | * @return a selection builder | 299 | * @return a selection builder |
300 | */ | 300 | */ |
301 | - public Builder matchMplsLabel(MplsLabel mplsLabel); | 301 | + Builder matchMplsLabel(MplsLabel mplsLabel); |
302 | 302 | ||
303 | /** | 303 | /** |
304 | * Matches on IPv6 Extension Header pseudo-field fiags. | 304 | * Matches on IPv6 Extension Header pseudo-field fiags. |
... | @@ -306,7 +306,7 @@ public interface TrafficSelector { | ... | @@ -306,7 +306,7 @@ public interface TrafficSelector { |
306 | * @param exthdrFlags the IPv6 Extension Header pseudo-field fiags | 306 | * @param exthdrFlags the IPv6 Extension Header pseudo-field fiags |
307 | * @return a selection builder | 307 | * @return a selection builder |
308 | */ | 308 | */ |
309 | - public Builder matchIPv6ExthdrFlags(short exthdrFlags); | 309 | + Builder matchIPv6ExthdrFlags(short exthdrFlags); |
310 | 310 | ||
311 | /** | 311 | /** |
312 | * Matches an optical signal ID or lambda. | 312 | * Matches an optical signal ID or lambda. |
... | @@ -314,7 +314,7 @@ public interface TrafficSelector { | ... | @@ -314,7 +314,7 @@ public interface TrafficSelector { |
314 | * @param lambda lamda | 314 | * @param lambda lamda |
315 | * @return a selection builder | 315 | * @return a selection builder |
316 | */ | 316 | */ |
317 | - public Builder matchLambda(short lambda); | 317 | + Builder matchLambda(short lambda); |
318 | 318 | ||
319 | /** | 319 | /** |
320 | * Matches an optical Signal Type. | 320 | * Matches an optical Signal Type. |
... | @@ -322,7 +322,7 @@ public interface TrafficSelector { | ... | @@ -322,7 +322,7 @@ public interface TrafficSelector { |
322 | * @param signalType signalType | 322 | * @param signalType signalType |
323 | * @return a selection builder | 323 | * @return a selection builder |
324 | */ | 324 | */ |
325 | - public Builder matchOpticalSignalType(short signalType); | 325 | + Builder matchOpticalSignalType(short signalType); |
326 | 326 | ||
327 | /** | 327 | /** |
328 | * Builds an immutable traffic selector. | 328 | * Builds an immutable traffic selector. | ... | ... |
-
Please register or login to post a comment