홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Sho SHIMIZU
Committed by Gerrit Code Review
3310a341 1 parent 9ff88a9b

Remove "public" to follow our convention 

Change-Id: Ic5fa8744cbcb4c704780c8467ae0f31fce3327ce
Inline Side-by-side
Showing 65 changed files with 276 additions and 276 deletions
...@@ -28,47 +28,47 @@ public interface IntentMetricsService { ...@@ -28,47 +28,47 @@ public interface IntentMetricsService {
28 * 28 *
29 * @return the last saved intent events 29 * @return the last saved intent events
30 */ 30 */
31 - public List<IntentEvent> getEvents(); 31 + List<IntentEvent> getEvents();
32 32
33 /** 33 /**
34 * Gets the Event Metric for the intent INSTALL_REQ events. 34 * Gets the Event Metric for the intent INSTALL_REQ events.
35 * 35 *
36 * @return the Event Metric for the intent INSTALL_REQ events 36 * @return the Event Metric for the intent INSTALL_REQ events
37 */ 37 */
38 - public EventMetric intentSubmittedEventMetric(); 38 + EventMetric intentSubmittedEventMetric();
39 39
40 /** 40 /**
41 * Gets the Event Metric for the intent INSTALLED events. 41 * Gets the Event Metric for the intent INSTALLED events.
42 * 42 *
43 * @return the Event Metric for the intent INSTALLED events 43 * @return the Event Metric for the intent INSTALLED events
44 */ 44 */
45 - public EventMetric intentInstalledEventMetric(); 45 + EventMetric intentInstalledEventMetric();
46 46
47 /** 47 /**
48 * Gets the Event Metric for the intent FAILED events. 48 * Gets the Event Metric for the intent FAILED events.
49 * 49 *
50 * @return the Event Metric for the intent FAILED events 50 * @return the Event Metric for the intent FAILED events
51 */ 51 */
52 - public EventMetric intentFailedEventMetric(); 52 + EventMetric intentFailedEventMetric();
53 53
54 /** 54 /**
55 * Gets the Event Metric for the intent WITHDRAW_REQ events. 55 * Gets the Event Metric for the intent WITHDRAW_REQ events.
56 * 56 *
57 * @return the Event Metric for the intent WITHDRAW_REQ events 57 * @return the Event Metric for the intent WITHDRAW_REQ events
58 */ 58 */
59 - public EventMetric intentWithdrawRequestedEventMetric(); 59 + EventMetric intentWithdrawRequestedEventMetric();
60 60
61 /** 61 /**
62 * Gets the Event Metric for the intent WITHDRAWN events. 62 * Gets the Event Metric for the intent WITHDRAWN events.
63 * 63 *
64 * @return the Event Metric for the intent WITHDRAWN events 64 * @return the Event Metric for the intent WITHDRAWN events
65 */ 65 */
66 - public EventMetric intentWithdrawnEventMetric(); 66 + EventMetric intentWithdrawnEventMetric();
67 67
68 /** 68 /**
69 * Gets the Event Metric for the intent PURGED events. 69 * Gets the Event Metric for the intent PURGED events.
70 * 70 *
71 * @return the Event Metric for the intent PURGED events 71 * @return the Event Metric for the intent PURGED events
72 */ 72 */
73 - public EventMetric intentPurgedEventMetric(); 73 + EventMetric intentPurgedEventMetric();
74 } 74 }
......
...@@ -28,40 +28,40 @@ public interface TopologyMetricsService { ...@@ -28,40 +28,40 @@ public interface TopologyMetricsService {
28 * 28 *
29 * @return the last saved topology events 29 * @return the last saved topology events
30 */ 30 */
31 - public List<Event> getEvents(); 31 + List<Event> getEvents();
32 32
33 /** 33 /**
34 * Gets the Event Metric for the Device Events. 34 * Gets the Event Metric for the Device Events.
35 * 35 *
36 * @return the Event Metric for the Device Events 36 * @return the Event Metric for the Device Events
37 */ 37 */
38 - public EventMetric topologyDeviceEventMetric(); 38 + EventMetric topologyDeviceEventMetric();
39 39
40 /** 40 /**
41 * Gets the Event Metric for the Host Events. 41 * Gets the Event Metric for the Host Events.
42 * 42 *
43 * @return the Event Metric for the Host Events 43 * @return the Event Metric for the Host Events
44 */ 44 */
45 - public EventMetric topologyHostEventMetric(); 45 + EventMetric topologyHostEventMetric();
46 46
47 /** 47 /**
48 * Gets the Event Metric for the Link Events. 48 * Gets the Event Metric for the Link Events.
49 * 49 *
50 * @return the Event Metric for the Link Events 50 * @return the Event Metric for the Link Events
51 */ 51 */
52 - public EventMetric topologyLinkEventMetric(); 52 + EventMetric topologyLinkEventMetric();
53 53
54 /** 54 /**
55 * Gets the Event Metric for the Topology Graph Events. 55 * Gets the Event Metric for the Topology Graph Events.
56 * 56 *
57 * @return the Event Metric for the Topology Graph Events 57 * @return the Event Metric for the Topology Graph Events
58 */ 58 */
59 - public EventMetric topologyGraphEventMetric(); 59 + EventMetric topologyGraphEventMetric();
60 60
61 /** 61 /**
62 * Gets the Event Metric for the Topology Graph Reasons Events. 62 * Gets the Event Metric for the Topology Graph Reasons Events.
63 * 63 *
64 * @return the Event Metric for the Topology Graph Reasons Events 64 * @return the Event Metric for the Topology Graph Reasons Events
65 */ 65 */
66 - public EventMetric topologyGraphReasonsEventMetric(); 66 + EventMetric topologyGraphReasonsEventMetric();
67 } 67 }
......
...@@ -26,5 +26,5 @@ public interface RouteListener { ...@@ -26,5 +26,5 @@ public interface RouteListener {
26 * 26 *
27 * @param routeUpdates the collection with updated route information 27 * @param routeUpdates the collection with updated route information
28 */ 28 */
29 - public void update(Collection<RouteUpdate> routeUpdates); 29 + void update(Collection<RouteUpdate> routeUpdates);
30 } 30 }
......
...@@ -29,7 +29,7 @@ public interface RoutingService { ...@@ -29,7 +29,7 @@ public interface RoutingService {
29 /** 29 /**
30 * Specifies the type of an IP address or an IP prefix location. 30 * Specifies the type of an IP address or an IP prefix location.
31 */ 31 */
32 - public static enum LocationType { 32 + static enum LocationType {
33 /** 33 /**
34 * The location of an IP address or an IP prefix is in local SDN network. 34 * The location of an IP address or an IP prefix is in local SDN network.
35 */ 35 */
...@@ -50,7 +50,7 @@ public interface RoutingService { ...@@ -50,7 +50,7 @@ public interface RoutingService {
50 * We classify traffic by the first packet of each traffic. 50 * We classify traffic by the first packet of each traffic.
51 * </p> 51 * </p>
52 */ 52 */
53 - public enum TrafficType { 53 + enum TrafficType {
54 /** 54 /**
55 * Traffic from a host located in local SDN network wants to 55 * Traffic from a host located in local SDN network wants to
56 * communicate with destination host located in Internet (outside 56 * communicate with destination host located in Internet (outside
...@@ -86,14 +86,14 @@ public interface RoutingService { ...@@ -86,14 +86,14 @@ public interface RoutingService {
86 /** 86 /**
87 * Starts the routing service. 87 * Starts the routing service.
88 */ 88 */
89 - public void start(); 89 + void start();
90 90
91 /** 91 /**
92 * Adds FIB listener. 92 * Adds FIB listener.
93 * 93 *
94 * @param fibListener listener to send FIB updates to 94 * @param fibListener listener to send FIB updates to
95 */ 95 */
96 - public void addFibListener(FibListener fibListener); 96 + void addFibListener(FibListener fibListener);
97 97
98 /** 98 /**
99 * Adds intent creation and submission listener. 99 * Adds intent creation and submission listener.
...@@ -101,27 +101,27 @@ public interface RoutingService { ...@@ -101,27 +101,27 @@ public interface RoutingService {
101 * @param intentRequestListener listener to send intent creation and 101 * @param intentRequestListener listener to send intent creation and
102 * submission request to 102 * submission request to
103 */ 103 */
104 - public void addIntentRequestListener(IntentRequestListener 104 + void addIntentRequestListener(IntentRequestListener
105 intentRequestListener); 105 intentRequestListener);
106 106
107 /** 107 /**
108 * Stops the routing service. 108 * Stops the routing service.
109 */ 109 */
110 - public void stop(); 110 + void stop();
111 111
112 /** 112 /**
113 * Gets all IPv4 routes known to SDN-IP. 113 * Gets all IPv4 routes known to SDN-IP.
114 * 114 *
115 * @return the SDN-IP IPv4 routes 115 * @return the SDN-IP IPv4 routes
116 */ 116 */
117 - public Collection<RouteEntry> getRoutes4(); 117 + Collection<RouteEntry> getRoutes4();
118 118
119 /** 119 /**
120 * Gets all IPv6 routes known to SDN-IP. 120 * Gets all IPv6 routes known to SDN-IP.
121 * 121 *
122 * @return the SDN-IP IPv6 routes 122 * @return the SDN-IP IPv6 routes
123 */ 123 */
124 - public Collection<RouteEntry> getRoutes6(); 124 + Collection<RouteEntry> getRoutes6();
125 125
126 /** 126 /**
127 * Evaluates the location of an IP address and returns the location type. 127 * Evaluates the location of an IP address and returns the location type.
...@@ -129,7 +129,7 @@ public interface RoutingService { ...@@ -129,7 +129,7 @@ public interface RoutingService {
129 * @param ipAddress the IP address to evaluate 129 * @param ipAddress the IP address to evaluate
130 * @return the IP address location type 130 * @return the IP address location type
131 */ 131 */
132 - public LocationType getLocationType(IpAddress ipAddress); 132 + LocationType getLocationType(IpAddress ipAddress);
133 133
134 /** 134 /**
135 * Finds out the route entry which has the longest matchable IP prefix. 135 * Finds out the route entry which has the longest matchable IP prefix.
...@@ -138,7 +138,7 @@ public interface RoutingService { ...@@ -138,7 +138,7 @@ public interface RoutingService {
138 * @return a route entry which has the longest matchable IP prefix if 138 * @return a route entry which has the longest matchable IP prefix if
139 * found, otherwise null 139 * found, otherwise null
140 */ 140 */
141 - public RouteEntry getLongestMatchableRouteEntry(IpAddress ipAddress); 141 + RouteEntry getLongestMatchableRouteEntry(IpAddress ipAddress);
142 142
143 /** 143 /**
144 * Finds out the egress connect point where to emit the first packet 144 * Finds out the egress connect point where to emit the first packet
...@@ -147,7 +147,7 @@ public interface RoutingService { ...@@ -147,7 +147,7 @@ public interface RoutingService {
147 * @param dstIpAddress the destination IP address 147 * @param dstIpAddress the destination IP address
148 * @return the egress connect point if found, otherwise null 148 * @return the egress connect point if found, otherwise null
149 */ 149 */
150 - public ConnectPoint getEgressConnectPoint(IpAddress dstIpAddress); 150 + ConnectPoint getEgressConnectPoint(IpAddress dstIpAddress);
151 151
152 /** 152 /**
153 * Routes packet reactively. 153 * Routes packet reactively.
...@@ -157,7 +157,7 @@ public interface RoutingService { ...@@ -157,7 +157,7 @@ public interface RoutingService {
157 * @param srcConnectPoint the connect point where a packet comes from 157 * @param srcConnectPoint the connect point where a packet comes from
158 * @param srcMacAddress the source MAC address of a packet 158 * @param srcMacAddress the source MAC address of a packet
159 */ 159 */
160 - public void packetReactiveProcessor(IpAddress dstIpAddress, 160 + void packetReactiveProcessor(IpAddress dstIpAddress,
161 IpAddress srcIpAddress, 161 IpAddress srcIpAddress,
162 ConnectPoint srcConnectPoint, 162 ConnectPoint srcConnectPoint,
163 MacAddress srcMacAddress); 163 MacAddress srcMacAddress);
......
...@@ -33,21 +33,21 @@ public interface RoutingConfigurationService { ...@@ -33,21 +33,21 @@ public interface RoutingConfigurationService {
33 * 33 *
34 * @return the map of BGP speaker names to BGP speaker objects 34 * @return the map of BGP speaker names to BGP speaker objects
35 */ 35 */
36 - public Map<String, BgpSpeaker> getBgpSpeakers(); 36 + Map<String, BgpSpeaker> getBgpSpeakers();
37 37
38 /** 38 /**
39 * Gets the list of configured BGP peers. 39 * Gets the list of configured BGP peers.
40 * 40 *
41 * @return the map from peer IP address to BgpPeer object 41 * @return the map from peer IP address to BgpPeer object
42 */ 42 */
43 - public Map<IpAddress, BgpPeer> getBgpPeers(); 43 + Map<IpAddress, BgpPeer> getBgpPeers();
44 44
45 /** 45 /**
46 * Gets the MAC address configured for virtual gateway in SDN network. 46 * Gets the MAC address configured for virtual gateway in SDN network.
47 * 47 *
48 * @return the MAC address of virtual gateway 48 * @return the MAC address of virtual gateway
49 */ 49 */
50 - public MacAddress getVirtualGatewayMacAddress(); 50 + MacAddress getVirtualGatewayMacAddress();
51 51
52 /** 52 /**
53 * Evaluates whether an IP address is a virtual gateway IP address. 53 * Evaluates whether an IP address is a virtual gateway IP address.
...@@ -55,7 +55,7 @@ public interface RoutingConfigurationService { ...@@ -55,7 +55,7 @@ public interface RoutingConfigurationService {
55 * @param ipAddress the IP address to evaluate 55 * @param ipAddress the IP address to evaluate
56 * @return true if the IP address is a virtual gateway address, otherwise false 56 * @return true if the IP address is a virtual gateway address, otherwise false
57 */ 57 */
58 - public boolean isVirtualGatewayIpAddress(IpAddress ipAddress); 58 + boolean isVirtualGatewayIpAddress(IpAddress ipAddress);
59 59
60 /** 60 /**
61 * Evaluates whether an IP address belongs to local SDN network. 61 * Evaluates whether an IP address belongs to local SDN network.
...@@ -63,7 +63,7 @@ public interface RoutingConfigurationService { ...@@ -63,7 +63,7 @@ public interface RoutingConfigurationService {
63 * @param ipAddress the IP address to evaluate 63 * @param ipAddress the IP address to evaluate
64 * @return true if the IP address belongs to local SDN network, otherwise false 64 * @return true if the IP address belongs to local SDN network, otherwise false
65 */ 65 */
66 - public boolean isIpAddressLocal(IpAddress ipAddress); 66 + boolean isIpAddressLocal(IpAddress ipAddress);
67 67
68 /** 68 /**
69 * Evaluates whether an IP prefix belongs to local SDN network. 69 * Evaluates whether an IP prefix belongs to local SDN network.
...@@ -71,7 +71,7 @@ public interface RoutingConfigurationService { ...@@ -71,7 +71,7 @@ public interface RoutingConfigurationService {
71 * @param ipPrefix the IP prefix to evaluate 71 * @param ipPrefix the IP prefix to evaluate
72 * @return true if the IP prefix belongs to local SDN network, otherwise false 72 * @return true if the IP prefix belongs to local SDN network, otherwise false
73 */ 73 */
74 - public boolean isIpPrefixLocal(IpPrefix ipPrefix); 74 + boolean isIpPrefixLocal(IpPrefix ipPrefix);
75 75
76 /** 76 /**
77 * Retrieves the entire set of interfaces in the network. 77 * Retrieves the entire set of interfaces in the network.
......
...@@ -27,19 +27,19 @@ public interface BgpInfoService { ...@@ -27,19 +27,19 @@ public interface BgpInfoService {
27 * 27 *
28 * @return the BGP sessions 28 * @return the BGP sessions
29 */ 29 */
30 - public Collection<BgpSession> getBgpSessions(); 30 + Collection<BgpSession> getBgpSessions();
31 31
32 /** 32 /**
33 * Gets the selected IPv4 BGP routes among all BGP sessions. 33 * Gets the selected IPv4 BGP routes among all BGP sessions.
34 * 34 *
35 * @return the selected IPv4 BGP routes among all BGP sessions 35 * @return the selected IPv4 BGP routes among all BGP sessions
36 */ 36 */
37 - public Collection<BgpRouteEntry> getBgpRoutes4(); 37 + Collection<BgpRouteEntry> getBgpRoutes4();
38 38
39 /** 39 /**
40 * Gets the selected IPv6 BGP routes among all BGP sessions. 40 * Gets the selected IPv6 BGP routes among all BGP sessions.
41 * 41 *
42 * @return the selected IPv6 BGP routes among all BGP sessions 42 * @return the selected IPv6 BGP routes among all BGP sessions
43 */ 43 */
44 - public Collection<BgpRouteEntry> getBgpRoutes6(); 44 + Collection<BgpRouteEntry> getBgpRoutes6();
45 } 45 }
......
...@@ -26,6 +26,6 @@ public interface SdnIpService { ...@@ -26,6 +26,6 @@ public interface SdnIpService {
26 * 26 *
27 * @param isPrimary true if the instance is primary, false if it is not 27 * @param isPrimary true if the instance is primary, false if it is not
28 */ 28 */
29 - public void modifyPrimary(boolean isPrimary); 29 + void modifyPrimary(boolean isPrimary);
30 30
31 } 31 }
......
...@@ -23,7 +23,7 @@ public interface NetworkConfigService { ...@@ -23,7 +23,7 @@ public interface NetworkConfigService {
23 * Suggests the action to be taken by the caller given the configuration 23 * Suggests the action to be taken by the caller given the configuration
24 * associated with the queried network-object (eg. switch, link etc.). 24 * associated with the queried network-object (eg. switch, link etc.).
25 */ 25 */
26 - public enum NetworkConfigState { 26 + enum NetworkConfigState {
27 /** 27 /**
28 * Associated network object has been configured to not be allowed in 28 * Associated network object has been configured to not be allowed in
29 * the network. 29 * the network.
...@@ -49,7 +49,7 @@ public interface NetworkConfigService { ...@@ -49,7 +49,7 @@ public interface NetworkConfigService {
49 * parameters to the caller, in response to a query for the configuration 49 * parameters to the caller, in response to a query for the configuration
50 * associated with a switch. 50 * associated with a switch.
51 */ 51 */
52 - public class SwitchConfigStatus { 52 + class SwitchConfigStatus {
53 private NetworkConfigState configState; 53 private NetworkConfigState configState;
54 private SwitchConfig switchConfig; 54 private SwitchConfig switchConfig;
55 private String msg; 55 private String msg;
...@@ -107,7 +107,7 @@ public interface NetworkConfigService { ...@@ -107,7 +107,7 @@ public interface NetworkConfigService {
107 * parameters to the caller, in response to a query for the configuration 107 * parameters to the caller, in response to a query for the configuration
108 * associated with a link. 108 * associated with a link.
109 */ 109 */
110 - public class LinkConfigStatus { 110 + class LinkConfigStatus {
111 private NetworkConfigState configState; 111 private NetworkConfigState configState;
112 private LinkConfig linkConfig; 112 private LinkConfig linkConfig;
113 private String msg; 113 private String msg;
...@@ -169,7 +169,7 @@ public interface NetworkConfigService { ...@@ -169,7 +169,7 @@ public interface NetworkConfigService {
169 * @param dpid device id of the switch to be queried 169 * @param dpid device id of the switch to be queried
170 * @return SwitchConfigStatus with outcome of check and associated config. 170 * @return SwitchConfigStatus with outcome of check and associated config.
171 */ 171 */
172 - public SwitchConfigStatus checkSwitchConfig(DeviceId dpid); 172 + SwitchConfigStatus checkSwitchConfig(DeviceId dpid);
173 173
174 /** 174 /**
175 * Reserved for future use. 175 * Reserved for future use.
...@@ -193,7 +193,7 @@ public interface NetworkConfigService { ...@@ -193,7 +193,7 @@ public interface NetworkConfigService {
193 * @param linkTuple unidirectional link to be queried 193 * @param linkTuple unidirectional link to be queried
194 * @return LinkConfigStatus with outcome of check and associated config. 194 * @return LinkConfigStatus with outcome of check and associated config.
195 */ 195 */
196 - public LinkConfigStatus checkLinkConfig(Link linkTuple); 196 + LinkConfigStatus checkLinkConfig(Link linkTuple);
197 197
198 /** 198 /**
199 * Retrieves a list of switches that have been configured, and have been 199 * Retrieves a list of switches that have been configured, and have been
...@@ -212,7 +212,7 @@ public interface NetworkConfigService { ...@@ -212,7 +212,7 @@ public interface NetworkConfigService {
212 * 212 *
213 * @return a non-null List of SwitchConfig which may be empty 213 * @return a non-null List of SwitchConfig which may be empty
214 */ 214 */
215 - public List<SwitchConfig> getConfiguredAllowedSwitches(); 215 + List<SwitchConfig> getConfiguredAllowedSwitches();
216 216
217 /** 217 /**
218 * Reserved for future use. 218 * Reserved for future use.
...@@ -237,7 +237,7 @@ public interface NetworkConfigService { ...@@ -237,7 +237,7 @@ public interface NetworkConfigService {
237 * 237 *
238 * @return a non-null List of LinkConfig which may be empty 238 * @return a non-null List of LinkConfig which may be empty
239 */ 239 */
240 - public List<LinkConfig> getConfiguredAllowedLinks(); 240 + List<LinkConfig> getConfiguredAllowedLinks();
241 241
242 /** 242 /**
243 * Retrieves the Dpid associated with a 'name' for a configured switch 243 * Retrieves the Dpid associated with a 'name' for a configured switch
...@@ -248,6 +248,6 @@ public interface NetworkConfigService { ...@@ -248,6 +248,6 @@ public interface NetworkConfigService {
248 * @return the Dpid corresponding to a given 'name', or null if no 248 * @return the Dpid corresponding to a given 'name', or null if no
249 * configured switch was found for the given 'name'. 249 * configured switch was found for the given 'name'.
250 */ 250 */
251 - public DeviceId getDpidForName(String name); 251 + DeviceId getDpidForName(String name);
252 252
253 } 253 }
......
...@@ -28,14 +28,14 @@ public interface VbngConfigurationService { ...@@ -28,14 +28,14 @@ public interface VbngConfigurationService {
28 * 28 *
29 * @return the IP address of next hop 29 * @return the IP address of next hop
30 */ 30 */
31 - public IpAddress getNextHopIpAddress(); 31 + IpAddress getNextHopIpAddress();
32 32
33 /** 33 /**
34 * Gets the MAC address configured for all the public IP addresses. 34 * Gets the MAC address configured for all the public IP addresses.
35 * 35 *
36 * @return the MAC address 36 * @return the MAC address
37 */ 37 */
38 - public MacAddress getPublicFacingMac(); 38 + MacAddress getPublicFacingMac();
39 39
40 /** 40 /**
41 * Evaluates whether an IP address is an assigned public IP address. 41 * Evaluates whether an IP address is an assigned public IP address.
...@@ -44,7 +44,7 @@ public interface VbngConfigurationService { ...@@ -44,7 +44,7 @@ public interface VbngConfigurationService {
44 * @return true if the input IP address is an assigned public IP address, 44 * @return true if the input IP address is an assigned public IP address,
45 * otherwise false 45 * otherwise false
46 */ 46 */
47 - public boolean isAssignedPublicIpAddress(IpAddress ipAddress); 47 + boolean isAssignedPublicIpAddress(IpAddress ipAddress);
48 48
49 /** 49 /**
50 * Gets an available public IP address from local public IP prefixes. 50 * Gets an available public IP address from local public IP prefixes.
...@@ -52,7 +52,7 @@ public interface VbngConfigurationService { ...@@ -52,7 +52,7 @@ public interface VbngConfigurationService {
52 * @param privateIpAddress a private IP address 52 * @param privateIpAddress a private IP address
53 * @return an available public IP address if it exists, otherwise null 53 * @return an available public IP address if it exists, otherwise null
54 */ 54 */
55 - public IpAddress getAvailablePublicIpAddress(IpAddress privateIpAddress); 55 + IpAddress getAvailablePublicIpAddress(IpAddress privateIpAddress);
56 56
57 /** 57 /**
58 * Gets the public IP address already assigned for a private IP address. 58 * Gets the public IP address already assigned for a private IP address.
...@@ -60,5 +60,5 @@ public interface VbngConfigurationService { ...@@ -60,5 +60,5 @@ public interface VbngConfigurationService {
60 * @param privateIpAddress a private IP address 60 * @param privateIpAddress a private IP address
61 * @return the assigned public IP address if it exists, otherwise null 61 * @return the assigned public IP address if it exists, otherwise null
62 */ 62 */
63 - public IpAddress getAssignedPublicIpAddress(IpAddress privateIpAddress); 63 + IpAddress getAssignedPublicIpAddress(IpAddress privateIpAddress);
64 } 64 }
......
...@@ -34,6 +34,6 @@ public interface VbngService { ...@@ -34,6 +34,6 @@ public interface VbngService {
34 * @return the public address if a virtual BGN is successfully created, 34 * @return the public address if a virtual BGN is successfully created,
35 * otherwise return null 35 * otherwise return null
36 */ 36 */
37 - public IpAddress createVbng(IpAddress privateIpAddress); 37 + IpAddress createVbng(IpAddress privateIpAddress);
38 38
39 } 39 }
......
...@@ -27,12 +27,12 @@ public interface CoreService { ...@@ -27,12 +27,12 @@ public interface CoreService {
27 /** 27 /**
28 * Name of the core "application". 28 * Name of the core "application".
29 */ 29 */
30 - public static final String CORE_APP_NAME = "org.onosproject.core"; 30 + static final String CORE_APP_NAME = "org.onosproject.core";
31 31
32 /** 32 /**
33 * Identifier of the core "provider". 33 * Identifier of the core "provider".
34 */ 34 */
35 - public static final ProviderId CORE_PROVIDER_ID = new ProviderId("core", CORE_APP_NAME); 35 + static final ProviderId CORE_PROVIDER_ID = new ProviderId("core", CORE_APP_NAME);
36 36
37 /** 37 /**
38 * Returns the product version. 38 * Returns the product version.
......
...@@ -27,7 +27,7 @@ public interface Annotations { ...@@ -27,7 +27,7 @@ public interface Annotations {
27 * 27 *
28 * @return annotation keys 28 * @return annotation keys
29 */ 29 */
30 - public Set<String> keys(); 30 + Set<String> keys();
31 31
32 /** 32 /**
33 * Returns the value of the specified annotation. 33 * Returns the value of the specified annotation.
...@@ -35,6 +35,6 @@ public interface Annotations { ...@@ -35,6 +35,6 @@ public interface Annotations {
35 * @param key annotation key 35 * @param key annotation key
36 * @return annotation value 36 * @return annotation value
37 */ 37 */
38 - public String value(String key); 38 + String value(String key);
39 39
40 } 40 }
......
...@@ -23,7 +23,7 @@ public interface Link extends Annotated, Provided, NetworkResource { ...@@ -23,7 +23,7 @@ public interface Link extends Annotated, Provided, NetworkResource {
23 /** 23 /**
24 * Coarse representation of the link type. 24 * Coarse representation of the link type.
25 */ 25 */
26 - public enum Type { 26 + enum Type {
27 /** 27 /**
28 * Signifies that this is a direct single-segment link. 28 * Signifies that this is a direct single-segment link.
29 */ 29 */
...@@ -59,7 +59,7 @@ public interface Link extends Annotated, Provided, NetworkResource { ...@@ -59,7 +59,7 @@ public interface Link extends Annotated, Provided, NetworkResource {
59 * configured durable links, i.e. those that need to remain present, 59 * configured durable links, i.e. those that need to remain present,
60 * but instead be marked as inactive. 60 * but instead be marked as inactive.
61 */ 61 */
62 - public enum State { 62 + enum State {
63 /** 63 /**
64 * Signifies that a link is currently active. 64 * Signifies that a link is currently active.
65 */ 65 */
......
...@@ -27,7 +27,7 @@ public interface MutableAnnotations extends Annotations { ...@@ -27,7 +27,7 @@ public interface MutableAnnotations extends Annotations {
27 * @param value annotation value 27 * @param value annotation value
28 * @return self 28 * @return self
29 */ 29 */
30 - public MutableAnnotations set(String key, String value); 30 + MutableAnnotations set(String key, String value);
31 31
32 /** 32 /**
33 * Clears the specified keys or the all keys if none were specified. 33 * Clears the specified keys or the all keys if none were specified.
...@@ -35,6 +35,6 @@ public interface MutableAnnotations extends Annotations { ...@@ -35,6 +35,6 @@ public interface MutableAnnotations extends Annotations {
35 * @param keys keys to be cleared 35 * @param keys keys to be cleared
36 * @return self 36 * @return self
37 */ 37 */
38 - public MutableAnnotations clear(String... keys); 38 + MutableAnnotations clear(String... keys);
39 39
40 } 40 }
......
...@@ -22,7 +22,7 @@ package org.onosproject.net; ...@@ -22,7 +22,7 @@ package org.onosproject.net;
22 public interface Port extends Annotated { 22 public interface Port extends Annotated {
23 23
24 /** Represents coarse port type classification. */ 24 /** Represents coarse port type classification. */
25 - public enum Type { 25 + enum Type {
26 /** 26 /**
27 * Signifies copper-based connectivity. 27 * Signifies copper-based connectivity.
28 */ 28 */
......
...@@ -30,7 +30,7 @@ public interface SparseAnnotations extends Annotations { ...@@ -30,7 +30,7 @@ public interface SparseAnnotations extends Annotations {
30 * </p> 30 * </p>
31 */ 31 */
32 @Override 32 @Override
33 - public Set<String> keys(); 33 + Set<String> keys();
34 34
35 /** 35 /**
36 * Indicates whether the specified key has been tagged as removed. This is 36 * Indicates whether the specified key has been tagged as removed. This is
...@@ -39,6 +39,6 @@ public interface SparseAnnotations extends Annotations { ...@@ -39,6 +39,6 @@ public interface SparseAnnotations extends Annotations {
39 * @param key annotation key 39 * @param key annotation key
40 * @return true if the previous annotation has been tagged for removal 40 * @return true if the previous annotation has been tagged for removal
41 */ 41 */
42 - public boolean isRemoved(String key); 42 + boolean isRemoved(String key);
43 43
44 } 44 }
......
...@@ -30,7 +30,7 @@ public interface DeviceClockProviderService { ...@@ -30,7 +30,7 @@ public interface DeviceClockProviderService {
30 * @param deviceId device identifier. 30 * @param deviceId device identifier.
31 * @return true if timestamp can be issued for specified device 31 * @return true if timestamp can be issued for specified device
32 */ 32 */
33 - public boolean isTimestampAvailable(DeviceId deviceId); 33 + boolean isTimestampAvailable(DeviceId deviceId);
34 34
35 /** 35 /**
36 * Updates the mastership term for the specified deviceId. 36 * Updates the mastership term for the specified deviceId.
...@@ -38,5 +38,5 @@ public interface DeviceClockProviderService { ...@@ -38,5 +38,5 @@ public interface DeviceClockProviderService {
38 * @param deviceId device identifier. 38 * @param deviceId device identifier.
39 * @param term mastership term. 39 * @param term mastership term.
40 */ 40 */
41 - public void setMastershipTerm(DeviceId deviceId, MastershipTerm term); 41 + void setMastershipTerm(DeviceId deviceId, MastershipTerm term);
42 } 42 }
......
...@@ -29,7 +29,7 @@ public interface DeviceClockService { ...@@ -29,7 +29,7 @@ public interface DeviceClockService {
29 * @param deviceId device identifier. 29 * @param deviceId device identifier.
30 * @return true if timestamp can be issued for specified device 30 * @return true if timestamp can be issued for specified device
31 */ 31 */
32 - public boolean isTimestampAvailable(DeviceId deviceId); 32 + boolean isTimestampAvailable(DeviceId deviceId);
33 33
34 /** 34 /**
35 * Returns a new timestamp for the specified deviceId. 35 * Returns a new timestamp for the specified deviceId.
...@@ -37,5 +37,5 @@ public interface DeviceClockService { ...@@ -37,5 +37,5 @@ public interface DeviceClockService {
37 * @param deviceId device identifier. 37 * @param deviceId device identifier.
38 * @return timestamp. 38 * @return timestamp.
39 */ 39 */
40 - public Timestamp getTimestamp(DeviceId deviceId); 40 + Timestamp getTimestamp(DeviceId deviceId);
41 } 41 }
......
...@@ -25,76 +25,76 @@ public interface PortStatistics { ...@@ -25,76 +25,76 @@ public interface PortStatistics {
25 * 25 *
26 * @return port number 26 * @return port number
27 */ 27 */
28 - public int port(); 28 + int port();
29 29
30 /** 30 /**
31 * Returns the number of packets received. 31 * Returns the number of packets received.
32 * 32 *
33 * @return the number of packets received 33 * @return the number of packets received
34 */ 34 */
35 - public long packetsReceived(); 35 + long packetsReceived();
36 36
37 /** 37 /**
38 * Returns the number of packets sent. 38 * Returns the number of packets sent.
39 * 39 *
40 * @return the number of packets sent 40 * @return the number of packets sent
41 */ 41 */
42 - public long packetsSent(); 42 + long packetsSent();
43 43
44 /** 44 /**
45 * Returns the bytes received. 45 * Returns the bytes received.
46 * 46 *
47 * @return the bytes received 47 * @return the bytes received
48 */ 48 */
49 - public long bytesReceived(); 49 + long bytesReceived();
50 50
51 /** 51 /**
52 * Returns the bytes sent. 52 * Returns the bytes sent.
53 * 53 *
54 * @return the bytes sent 54 * @return the bytes sent
55 */ 55 */
56 - public long bytesSent(); 56 + long bytesSent();
57 57
58 /** 58 /**
59 * Returns the number of packets dropped by RX. 59 * Returns the number of packets dropped by RX.
60 * 60 *
61 * @return the number of packets dropped by RX 61 * @return the number of packets dropped by RX
62 */ 62 */
63 - public long packetsRxDropped(); 63 + long packetsRxDropped();
64 64
65 /** 65 /**
66 * Returns the number of packets dropped by TX. 66 * Returns the number of packets dropped by TX.
67 * 67 *
68 * @return the number of packets dropped by TX 68 * @return the number of packets dropped by TX
69 */ 69 */
70 - public long packetsTxDropped(); 70 + long packetsTxDropped();
71 71
72 /** 72 /**
73 * Returns the number of transmit errors. 73 * Returns the number of transmit errors.
74 * 74 *
75 * @return the number of transmit errors 75 * @return the number of transmit errors
76 */ 76 */
77 - public long packetsRxErrors(); 77 + long packetsRxErrors();
78 78
79 /** 79 /**
80 * Returns the number of receive errors. 80 * Returns the number of receive errors.
81 * 81 *
82 * @return the number of receive error 82 * @return the number of receive error
83 */ 83 */
84 - public long packetsTxErrors(); 84 + long packetsTxErrors();
85 85
86 /** 86 /**
87 * Returns the time port has been alive in seconds. 87 * Returns the time port has been alive in seconds.
88 * 88 *
89 * @return the time port has been alive in seconds 89 * @return the time port has been alive in seconds
90 */ 90 */
91 - public long durationSec(); 91 + long durationSec();
92 92
93 /** 93 /**
94 * Returns the time port has been alive in nano seconds. 94 * Returns the time port has been alive in nano seconds.
95 * 95 *
96 * @return the time port has been alive in nano seconds 96 * @return the time port has been alive in nano seconds
97 */ 97 */
98 - public long durationNano(); 98 + long durationNano();
99 99
100 } 100 }
......
...@@ -23,7 +23,7 @@ package org.onosproject.net.flow; ...@@ -23,7 +23,7 @@ package org.onosproject.net.flow;
23 public interface FlowEntry extends FlowRule { 23 public interface FlowEntry extends FlowRule {
24 24
25 25
26 - public enum FlowEntryState { 26 + enum FlowEntryState {
27 27
28 /** 28 /**
29 * Indicates that this rule has been submitted for addition. 29 * Indicates that this rule has been submitted for addition.
......
...@@ -34,7 +34,7 @@ public interface FlowRule { ...@@ -34,7 +34,7 @@ public interface FlowRule {
34 * Default is used. 34 * Default is used.
35 */ 35 */
36 @Deprecated 36 @Deprecated
37 - public static enum Type { 37 + static enum Type {
38 /* 38 /*
39 * Default type - used in flow rule for single table switch NOTE: this 39 * Default type - used in flow rule for single table switch NOTE: this
40 * setting should not be used as Table 0 in a multi-table pipeline 40 * setting should not be used as Table 0 in a multi-table pipeline
...@@ -138,7 +138,7 @@ public interface FlowRule { ...@@ -138,7 +138,7 @@ public interface FlowRule {
138 /** 138 /**
139 * A flowrule builder. 139 * A flowrule builder.
140 */ 140 */
141 - public interface Builder { 141 + interface Builder {
142 142
143 /** 143 /**
144 * Assigns a cookie value to this flowrule. Mutually exclusive with the 144 * Assigns a cookie value to this flowrule. Mutually exclusive with the
......
...@@ -25,7 +25,7 @@ public interface Criterion { ...@@ -25,7 +25,7 @@ public interface Criterion {
25 * Types of fields to which the selection criterion may apply. 25 * Types of fields to which the selection criterion may apply.
26 */ 26 */
27 // From page 75 of OpenFlow 1.5.0 spec 27 // From page 75 of OpenFlow 1.5.0 spec
28 - public enum Type { 28 + enum Type {
29 /** Switch input port. */ 29 /** Switch input port. */
30 IN_PORT, 30 IN_PORT,
31 /** Switch physical input port. */ 31 /** Switch physical input port. */
...@@ -137,13 +137,13 @@ public interface Criterion { ...@@ -137,13 +137,13 @@ public interface Criterion {
137 * 137 *
138 * @return type of criterion 138 * @return type of criterion
139 */ 139 */
140 - public Type type(); 140 + Type type();
141 141
142 /** 142 /**
143 * Bit definitions for IPv6 Extension Header pseudo-field. 143 * Bit definitions for IPv6 Extension Header pseudo-field.
144 * From page 79 of OpenFlow 1.5.0 spec. 144 * From page 79 of OpenFlow 1.5.0 spec.
145 */ 145 */
146 - public enum IPv6ExthdrFlags { 146 + enum IPv6ExthdrFlags {
147 /** "No next header" encountered. */ 147 /** "No next header" encountered. */
148 NONEXT((short) (1 << 0)), 148 NONEXT((short) (1 << 0)),
149 /** Encrypted Sec Payload header present. */ 149 /** Encrypted Sec Payload header present. */
......
...@@ -45,13 +45,13 @@ public interface FilteringObjective extends Objective { ...@@ -45,13 +45,13 @@ public interface FilteringObjective extends Objective {
45 * 45 *
46 * @return a criterion 46 * @return a criterion
47 */ 47 */
48 - public Criterion key(); 48 + Criterion key();
49 49
50 /** 50 /**
51 * Obtain this filtering type. 51 * Obtain this filtering type.
52 * @return the type 52 * @return the type
53 */ 53 */
54 - public Type type(); 54 + Type type();
55 55
56 /** 56 /**
57 * The set of conditions the filter must provision at the device. 57 * The set of conditions the filter must provision at the device.
...@@ -63,7 +63,7 @@ public interface FilteringObjective extends Objective { ...@@ -63,7 +63,7 @@ public interface FilteringObjective extends Objective {
63 /** 63 /**
64 * Builder of Filtering objective entities. 64 * Builder of Filtering objective entities.
65 */ 65 */
66 - public interface Builder extends Objective.Builder { 66 + interface Builder extends Objective.Builder {
67 67
68 /** 68 /**
69 * Specify the key for the filter. 69 * Specify the key for the filter.
...@@ -71,7 +71,7 @@ public interface FilteringObjective extends Objective { ...@@ -71,7 +71,7 @@ public interface FilteringObjective extends Objective {
71 * @param key a criterion 71 * @param key a criterion
72 * @return a filter objective builder 72 * @return a filter objective builder
73 */ 73 */
74 - public Builder withKey(Criterion key); 74 + Builder withKey(Criterion key);
75 75
76 /** 76 /**
77 * Add a filtering condition. 77 * Add a filtering condition.
...@@ -79,40 +79,40 @@ public interface FilteringObjective extends Objective { ...@@ -79,40 +79,40 @@ public interface FilteringObjective extends Objective {
79 * @param criterion new criterion 79 * @param criterion new criterion
80 * @return a filtering builder 80 * @return a filtering builder
81 */ 81 */
82 - public Builder addCondition(Criterion criterion); 82 + Builder addCondition(Criterion criterion);
83 83
84 /** 84 /**
85 * Permit this filtering condition set. 85 * Permit this filtering condition set.
86 * @return a filtering builder 86 * @return a filtering builder
87 */ 87 */
88 - public Builder permit(); 88 + Builder permit();
89 89
90 /** 90 /**
91 * Deny this filtering condition set. 91 * Deny this filtering condition set.
92 * @return a filtering builder 92 * @return a filtering builder
93 */ 93 */
94 - public Builder deny(); 94 + Builder deny();
95 95
96 /** 96 /**
97 * Assigns an application id. 97 * Assigns an application id.
98 * @param appId an application id 98 * @param appId an application id
99 * @return a filtering builder 99 * @return a filtering builder
100 */ 100 */
101 - public Builder fromApp(ApplicationId appId); 101 + Builder fromApp(ApplicationId appId);
102 102
103 /** 103 /**
104 * Builds the filtering objective that will be added. 104 * Builds the filtering objective that will be added.
105 * 105 *
106 * @return a filtering objective 106 * @return a filtering objective
107 */ 107 */
108 - public FilteringObjective add(); 108 + FilteringObjective add();
109 109
110 /** 110 /**
111 * Builds the filtering objective that will be removed. 111 * Builds the filtering objective that will be removed.
112 * 112 *
113 * @return a filtering objective. 113 * @return a filtering objective.
114 */ 114 */
115 - public FilteringObjective remove(); 115 + FilteringObjective remove();
116 116
117 /** 117 /**
118 * Builds the filtering objective that will be added. 118 * Builds the filtering objective that will be added.
...@@ -121,7 +121,7 @@ public interface FilteringObjective extends Objective { ...@@ -121,7 +121,7 @@ public interface FilteringObjective extends Objective {
121 * @param context an objective context 121 * @param context an objective context
122 * @return a filtering objective 122 * @return a filtering objective
123 */ 123 */
124 - public FilteringObjective add(ObjectiveContext context); 124 + FilteringObjective add(ObjectiveContext context);
125 125
126 /** 126 /**
127 * Builds the filtering objective that will be removed. 127 * Builds the filtering objective that will be removed.
...@@ -130,7 +130,7 @@ public interface FilteringObjective extends Objective { ...@@ -130,7 +130,7 @@ public interface FilteringObjective extends Objective {
130 * @param context an objective context 130 * @param context an objective context
131 * @return a filtering objective 131 * @return a filtering objective
132 */ 132 */
133 - public FilteringObjective remove(ObjectiveContext context); 133 + FilteringObjective remove(ObjectiveContext context);
134 134
135 135
136 } 136 }
......
...@@ -74,7 +74,7 @@ public interface ForwardingObjective extends Objective { ...@@ -74,7 +74,7 @@ public interface ForwardingObjective extends Objective {
74 /** 74 /**
75 * A forwarding objective builder. 75 * A forwarding objective builder.
76 */ 76 */
77 - public interface Builder extends Objective.Builder { 77 + interface Builder extends Objective.Builder {
78 78
79 /** 79 /**
80 * Assigns a selector to the forwarding objective. 80 * Assigns a selector to the forwarding objective.
...@@ -82,7 +82,7 @@ public interface ForwardingObjective extends Objective { ...@@ -82,7 +82,7 @@ public interface ForwardingObjective extends Objective {
82 * @param selector a traffic selector 82 * @param selector a traffic selector
83 * @return a forwarding objective builder 83 * @return a forwarding objective builder
84 */ 84 */
85 - public Builder withSelector(TrafficSelector selector); 85 + Builder withSelector(TrafficSelector selector);
86 86
87 /** 87 /**
88 * Assigns a next step to the forwarding objective. 88 * Assigns a next step to the forwarding objective.
...@@ -90,7 +90,7 @@ public interface ForwardingObjective extends Objective { ...@@ -90,7 +90,7 @@ public interface ForwardingObjective extends Objective {
90 * @param nextId a next objective id. 90 * @param nextId a next objective id.
91 * @return a forwarding objective builder 91 * @return a forwarding objective builder
92 */ 92 */
93 - public Builder nextStep(int nextId); 93 + Builder nextStep(int nextId);
94 94
95 /** 95 /**
96 * Assigns the treatment for this forwarding objective. 96 * Assigns the treatment for this forwarding objective.
...@@ -98,7 +98,7 @@ public interface ForwardingObjective extends Objective { ...@@ -98,7 +98,7 @@ public interface ForwardingObjective extends Objective {
98 * @param treatment a traffic treatment 98 * @param treatment a traffic treatment
99 * @return a forwarding objective 99 * @return a forwarding objective
100 */ 100 */
101 - public Builder withTreatment(TrafficTreatment treatment); 101 + Builder withTreatment(TrafficTreatment treatment);
102 102
103 /** 103 /**
104 * Assigns the flag to the forwarding objective. 104 * Assigns the flag to the forwarding objective.
...@@ -106,21 +106,21 @@ public interface ForwardingObjective extends Objective { ...@@ -106,21 +106,21 @@ public interface ForwardingObjective extends Objective {
106 * @param flag a flag 106 * @param flag a flag
107 * @return a forwarding objective builder 107 * @return a forwarding objective builder
108 */ 108 */
109 - public Builder withFlag(Flag flag); 109 + Builder withFlag(Flag flag);
110 110
111 /** 111 /**
112 * Builds the forwarding objective that will be added. 112 * Builds the forwarding objective that will be added.
113 * 113 *
114 * @return a forwarding objective 114 * @return a forwarding objective
115 */ 115 */
116 - public ForwardingObjective add(); 116 + ForwardingObjective add();
117 117
118 /** 118 /**
119 * Builds the forwarding objective that will be removed. 119 * Builds the forwarding objective that will be removed.
120 * 120 *
121 * @return a forwarding objective. 121 * @return a forwarding objective.
122 */ 122 */
123 - public ForwardingObjective remove(); 123 + ForwardingObjective remove();
124 124
125 /** 125 /**
126 * Builds the forwarding objective that will be added. 126 * Builds the forwarding objective that will be added.
...@@ -129,7 +129,7 @@ public interface ForwardingObjective extends Objective { ...@@ -129,7 +129,7 @@ public interface ForwardingObjective extends Objective {
129 * @param context an objective context 129 * @param context an objective context
130 * @return a forwarding objective 130 * @return a forwarding objective
131 */ 131 */
132 - public ForwardingObjective add(ObjectiveContext context); 132 + ForwardingObjective add(ObjectiveContext context);
133 133
134 /** 134 /**
135 * Builds the forwarding objective that will be removed. 135 * Builds the forwarding objective that will be removed.
...@@ -138,6 +138,6 @@ public interface ForwardingObjective extends Objective { ...@@ -138,6 +138,6 @@ public interface ForwardingObjective extends Objective {
138 * @param context an objective context 138 * @param context an objective context
139 * @return a forwarding objective 139 * @return a forwarding objective
140 */ 140 */
141 - public ForwardingObjective remove(ObjectiveContext context); 141 + ForwardingObjective remove(ObjectiveContext context);
142 } 142 }
143 } 143 }
......
...@@ -70,7 +70,7 @@ public interface NextObjective extends Objective { ...@@ -70,7 +70,7 @@ public interface NextObjective extends Objective {
70 /** 70 /**
71 * A next step builder. 71 * A next step builder.
72 */ 72 */
73 - public interface Builder extends Objective.Builder { 73 + interface Builder extends Objective.Builder {
74 74
75 /** 75 /**
76 * Specifies the id for this next objective. 76 * Specifies the id for this next objective.
...@@ -78,7 +78,7 @@ public interface NextObjective extends Objective { ...@@ -78,7 +78,7 @@ public interface NextObjective extends Objective {
78 * @param nextId an integer 78 * @param nextId an integer
79 * @return a next objective builder 79 * @return a next objective builder
80 */ 80 */
81 - public Builder withId(int nextId); 81 + Builder withId(int nextId);
82 82
83 /** 83 /**
84 * Sets the type of next step. 84 * Sets the type of next step.
...@@ -86,7 +86,7 @@ public interface NextObjective extends Objective { ...@@ -86,7 +86,7 @@ public interface NextObjective extends Objective {
86 * @param type a type 86 * @param type a type
87 * @return a next step builder 87 * @return a next step builder
88 */ 88 */
89 - public Builder withType(Type type); 89 + Builder withType(Type type);
90 90
91 /** 91 /**
92 * Adds a treatment to this next step. 92 * Adds a treatment to this next step.
...@@ -94,24 +94,24 @@ public interface NextObjective extends Objective { ...@@ -94,24 +94,24 @@ public interface NextObjective extends Objective {
94 * @param treatment a traffic treatment 94 * @param treatment a traffic treatment
95 * @return a next step builder 95 * @return a next step builder
96 */ 96 */
97 - public Builder addTreatment(TrafficTreatment treatment); 97 + Builder addTreatment(TrafficTreatment treatment);
98 98
99 @Override 99 @Override
100 - public Builder fromApp(ApplicationId appId); 100 + Builder fromApp(ApplicationId appId);
101 101
102 /** 102 /**
103 * Builds the next objective that will be added. 103 * Builds the next objective that will be added.
104 * 104 *
105 * @return a next objective 105 * @return a next objective
106 */ 106 */
107 - public NextObjective add(); 107 + NextObjective add();
108 108
109 /** 109 /**
110 * Builds the next objective that will be removed. 110 * Builds the next objective that will be removed.
111 * 111 *
112 * @return a next objective. 112 * @return a next objective.
113 */ 113 */
114 - public NextObjective remove(); 114 + NextObjective remove();
115 115
116 /** 116 /**
117 * Builds the next objective that will be added. 117 * Builds the next objective that will be added.
...@@ -120,7 +120,7 @@ public interface NextObjective extends Objective { ...@@ -120,7 +120,7 @@ public interface NextObjective extends Objective {
120 * @param context an objective context 120 * @param context an objective context
121 * @return a next objective 121 * @return a next objective
122 */ 122 */
123 - public NextObjective add(ObjectiveContext context); 123 + NextObjective add(ObjectiveContext context);
124 124
125 /** 125 /**
126 * Builds the next objective that will be removed. 126 * Builds the next objective that will be removed.
...@@ -129,7 +129,7 @@ public interface NextObjective extends Objective { ...@@ -129,7 +129,7 @@ public interface NextObjective extends Objective {
129 * @param context an objective context 129 * @param context an objective context
130 * @return a next objective 130 * @return a next objective
131 */ 131 */
132 - public NextObjective remove(ObjectiveContext context); 132 + NextObjective remove(ObjectiveContext context);
133 133
134 } 134 }
135 135
......
...@@ -96,21 +96,21 @@ public interface Objective { ...@@ -96,21 +96,21 @@ public interface Objective {
96 /** 96 /**
97 * An objective builder. 97 * An objective builder.
98 */ 98 */
99 - public interface Builder { 99 + interface Builder {
100 /** 100 /**
101 * Makes the filtering objective temporary. 101 * Makes the filtering objective temporary.
102 * 102 *
103 * @param timeout a timeout 103 * @param timeout a timeout
104 * @return an objective builder 104 * @return an objective builder
105 */ 105 */
106 - public Builder makeTemporary(int timeout); 106 + Builder makeTemporary(int timeout);
107 107
108 /** 108 /**
109 * Makes the filtering objective permanent. 109 * Makes the filtering objective permanent.
110 * 110 *
111 * @return an objective builder 111 * @return an objective builder
112 */ 112 */
113 - public Builder makePermanent(); 113 + Builder makePermanent();
114 114
115 /** 115 /**
116 * Specifies the application which applied the filter. 116 * Specifies the application which applied the filter.
...@@ -118,7 +118,7 @@ public interface Objective { ...@@ -118,7 +118,7 @@ public interface Objective {
118 * @param appId an application id 118 * @param appId an application id
119 * @return an objective builder 119 * @return an objective builder
120 */ 120 */
121 - public Builder fromApp(ApplicationId appId); 121 + Builder fromApp(ApplicationId appId);
122 122
123 /** 123 /**
124 * Sets the priority for this objective. 124 * Sets the priority for this objective.
...@@ -126,7 +126,7 @@ public interface Objective { ...@@ -126,7 +126,7 @@ public interface Objective {
126 * @param priority an integer 126 * @param priority an integer
127 * @return an objective builder 127 * @return an objective builder
128 */ 128 */
129 - public Builder withPriority(int priority); 129 + Builder withPriority(int priority);
130 } 130 }
131 131
132 } 132 }
......
...@@ -24,7 +24,7 @@ public interface Group extends GroupDescription { ...@@ -24,7 +24,7 @@ public interface Group extends GroupDescription {
24 /** 24 /**
25 * State of the group object in ONOS. 25 * State of the group object in ONOS.
26 */ 26 */
27 - public enum GroupState { 27 + enum GroupState {
28 /** 28 /**
29 * Group create request is queued as group AUDIT is in progress. 29 * Group create request is queued as group AUDIT is in progress.
30 */ 30 */
......
...@@ -32,21 +32,21 @@ public interface GroupBucket { ...@@ -32,21 +32,21 @@ public interface GroupBucket {
32 * 32 *
33 * @return GroupType group type 33 * @return GroupType group type
34 */ 34 */
35 - public GroupDescription.Type type(); 35 + GroupDescription.Type type();
36 36
37 /** 37 /**
38 * Returns list of Traffic instructions that are part of the bucket. 38 * Returns list of Traffic instructions that are part of the bucket.
39 * 39 *
40 * @return TrafficTreatment traffic instruction list 40 * @return TrafficTreatment traffic instruction list
41 */ 41 */
42 - public TrafficTreatment treatment(); 42 + TrafficTreatment treatment();
43 43
44 /** 44 /**
45 * Returns weight of select group bucket. 45 * Returns weight of select group bucket.
46 * 46 *
47 * @return short weight associated with a bucket 47 * @return short weight associated with a bucket
48 */ 48 */
49 - public short weight(); 49 + short weight();
50 50
51 /** 51 /**
52 * Returns port number used for liveness detection for a 52 * Returns port number used for liveness detection for a
...@@ -54,7 +54,7 @@ public interface GroupBucket { ...@@ -54,7 +54,7 @@ public interface GroupBucket {
54 * 54 *
55 * @return PortNumber port number used for liveness detection 55 * @return PortNumber port number used for liveness detection
56 */ 56 */
57 - public PortNumber watchPort(); 57 + PortNumber watchPort();
58 58
59 /** 59 /**
60 * Returns group identifier used for liveness detection for a 60 * Returns group identifier used for liveness detection for a
...@@ -62,7 +62,7 @@ public interface GroupBucket { ...@@ -62,7 +62,7 @@ public interface GroupBucket {
62 * 62 *
63 * @return GroupId group identifier to be used for liveness detection 63 * @return GroupId group identifier to be used for liveness detection
64 */ 64 */
65 - public GroupId watchGroup(); 65 + GroupId watchGroup();
66 66
67 /** 67 /**
68 * Returns the number of packets processed by this group bucket. 68 * Returns the number of packets processed by this group bucket.
......
...@@ -27,7 +27,7 @@ public interface GroupDescription { ...@@ -27,7 +27,7 @@ public interface GroupDescription {
27 /** 27 /**
28 * Types of the group supported by ONOS. 28 * Types of the group supported by ONOS.
29 */ 29 */
30 - public enum Type { 30 + enum Type {
31 /** 31 /**
32 * Load-balancing among different buckets in a group. 32 * Load-balancing among different buckets in a group.
33 */ 33 */
...@@ -51,28 +51,28 @@ public interface GroupDescription { ...@@ -51,28 +51,28 @@ public interface GroupDescription {
51 * 51 *
52 * @return GroupType group type 52 * @return GroupType group type
53 */ 53 */
54 - public Type type(); 54 + Type type();
55 55
56 /** 56 /**
57 * Returns device identifier on which this group object is created. 57 * Returns device identifier on which this group object is created.
58 * 58 *
59 * @return DeviceId device identifier 59 * @return DeviceId device identifier
60 */ 60 */
61 - public DeviceId deviceId(); 61 + DeviceId deviceId();
62 62
63 /** 63 /**
64 * Returns application identifier that has created this group object. 64 * Returns application identifier that has created this group object.
65 * 65 *
66 * @return ApplicationId application identifier 66 * @return ApplicationId application identifier
67 */ 67 */
68 - public ApplicationId appId(); 68 + ApplicationId appId();
69 69
70 /** 70 /**
71 * Returns application cookie associated with a group object. 71 * Returns application cookie associated with a group object.
72 * 72 *
73 * @return GroupKey application cookie 73 * @return GroupKey application cookie
74 */ 74 */
75 - public GroupKey appCookie(); 75 + GroupKey appCookie();
76 76
77 /** 77 /**
78 * Returns groupId passed in by caller. 78 * Returns groupId passed in by caller.
...@@ -80,12 +80,12 @@ public interface GroupDescription { ...@@ -80,12 +80,12 @@ public interface GroupDescription {
80 * @return Integer group id passed in by caller. May be null if caller 80 * @return Integer group id passed in by caller. May be null if caller
81 * passed in null to let groupService determin the group id. 81 * passed in null to let groupService determin the group id.
82 */ 82 */
83 - public Integer givenGroupId(); 83 + Integer givenGroupId();
84 84
85 /** 85 /**
86 * Returns group buckets of a group. 86 * Returns group buckets of a group.
87 * 87 *
88 * @return GroupBuckets immutable list of group bucket 88 * @return GroupBuckets immutable list of group bucket
89 */ 89 */
90 - public GroupBuckets buckets(); 90 + GroupBuckets buckets();
91 } 91 }
......
...@@ -27,5 +27,5 @@ public interface GroupKey { ...@@ -27,5 +27,5 @@ public interface GroupKey {
27 * 27 *
28 * @return byte array 28 * @return byte array
29 */ 29 */
30 - public byte[] key(); 30 + byte[] key();
31 } 31 }
......
...@@ -24,7 +24,7 @@ import org.onosproject.store.Store; ...@@ -24,7 +24,7 @@ import org.onosproject.store.Store;
24 */ 24 */
25 public interface GroupStore extends Store<GroupEvent, GroupStoreDelegate> { 25 public interface GroupStore extends Store<GroupEvent, GroupStoreDelegate> {
26 26
27 - public enum UpdateType { 27 + enum UpdateType {
28 /** 28 /**
29 * Modify existing group entry by adding provided information. 29 * Modify existing group entry by adding provided information.
30 */ 30 */
......
...@@ -28,5 +28,5 @@ public interface HostClockService { ...@@ -28,5 +28,5 @@ public interface HostClockService {
28 * @param hostId identifier for the host. 28 * @param hostId identifier for the host.
29 * @return timestamp. 29 * @return timestamp.
30 */ 30 */
31 - public Timestamp getTimestamp(HostId hostId); 31 + Timestamp getTimestamp(HostId hostId);
32 } 32 }
......
...@@ -35,7 +35,7 @@ public interface HostService { ...@@ -35,7 +35,7 @@ public interface HostService {
35 * 35 *
36 * @return number of end-station hosts 36 * @return number of end-station hosts
37 */ 37 */
38 - public int getHostCount(); 38 + int getHostCount();
39 39
40 /** 40 /**
41 * Returns a collection of all end-station hosts. 41 * Returns a collection of all end-station hosts.
......
...@@ -28,5 +28,5 @@ public interface IntentClockService { ...@@ -28,5 +28,5 @@ public interface IntentClockService {
28 * @param intentId identifier for the intent. 28 * @param intentId identifier for the intent.
29 * @return timestamp 29 * @return timestamp
30 */ 30 */
31 - public Timestamp getTimestamp(IntentId intentId); 31 + Timestamp getTimestamp(IntentId intentId);
32 } 32 }
......
...@@ -91,7 +91,7 @@ public interface LinkStore extends Store<LinkEvent, LinkStoreDelegate> { ...@@ -91,7 +91,7 @@ public interface LinkStore extends Store<LinkEvent, LinkStoreDelegate> {
91 * @param linkDescription link description 91 * @param linkDescription link description
92 * @return create or update link event, or null if no change resulted 92 * @return create or update link event, or null if no change resulted
93 */ 93 */
94 - public LinkEvent createOrUpdateLink(ProviderId providerId, 94 + LinkEvent createOrUpdateLink(ProviderId providerId,
95 LinkDescription linkDescription); 95 LinkDescription linkDescription);
96 96
97 /** 97 /**
......
...@@ -22,9 +22,9 @@ package org.onosproject.net.packet; ...@@ -22,9 +22,9 @@ package org.onosproject.net.packet;
22 */ 22 */
23 public interface PacketProcessor { 23 public interface PacketProcessor {
24 24
25 - public static final int ADVISOR_MAX = Integer.MAX_VALUE / 3; 25 + static final int ADVISOR_MAX = Integer.MAX_VALUE / 3;
26 - public static final int DIRECTOR_MAX = (Integer.MAX_VALUE / 3) * 2; 26 + static final int DIRECTOR_MAX = (Integer.MAX_VALUE / 3) * 2;
27 - public static final int OBSERVER_MAX = Integer.MAX_VALUE; 27 + static final int OBSERVER_MAX = Integer.MAX_VALUE;
28 28
29 /** 29 /**
30 * Processes the inbound packet as specified in the given context. 30 * Processes the inbound packet as specified in the given context.
......
...@@ -28,24 +28,24 @@ public interface PacketRequest { ...@@ -28,24 +28,24 @@ public interface PacketRequest {
28 * Obtain the traffic selector. 28 * Obtain the traffic selector.
29 * @return a traffic selector 29 * @return a traffic selector
30 */ 30 */
31 - public TrafficSelector selector(); 31 + TrafficSelector selector();
32 32
33 /** 33 /**
34 * Obtain the priority. 34 * Obtain the priority.
35 * @return a PacketPriority 35 * @return a PacketPriority
36 */ 36 */
37 - public PacketPriority priority(); 37 + PacketPriority priority();
38 38
39 /** 39 /**
40 * Obtain the application id. 40 * Obtain the application id.
41 * @return an application id 41 * @return an application id
42 */ 42 */
43 - public ApplicationId appId(); 43 + ApplicationId appId();
44 44
45 /** 45 /**
46 * Obtain the table type. 46 * Obtain the table type.
47 * @return a table type 47 * @return a table type
48 */ 48 */
49 - public FlowRule.Type tableType(); 49 + FlowRule.Type tableType();
50 50
51 } 51 }
......
...@@ -13,11 +13,11 @@ public interface LabelResource extends Annotated, Provided, NetworkResource { ...@@ -13,11 +13,11 @@ public interface LabelResource extends Annotated, Provided, NetworkResource {
13 * Returns device id. 13 * Returns device id.
14 * @return DeviceId 14 * @return DeviceId
15 */ 15 */
16 - public DeviceId deviceId(); 16 + DeviceId deviceId();
17 17
18 /** 18 /**
19 * Returns labelResource Id. 19 * Returns labelResource Id.
20 * @return LabelResourceId 20 * @return LabelResourceId
21 */ 21 */
22 - public LabelResourceId labelResourceId(); 22 + LabelResourceId labelResourceId();
23 } 23 }
......
...@@ -57,14 +57,14 @@ public interface LinkResourceRequest extends ResourceRequest { ...@@ -57,14 +57,14 @@ public interface LinkResourceRequest extends ResourceRequest {
57 * 57 *
58 * @return self 58 * @return self
59 */ 59 */
60 - public Builder addLambdaRequest(); 60 + Builder addLambdaRequest();
61 61
62 /** 62 /**
63 * Adds MPLS request. 63 * Adds MPLS request.
64 * 64 *
65 * @return self 65 * @return self
66 */ 66 */
67 - public Builder addMplsRequest(); 67 + Builder addMplsRequest();
68 68
69 /** 69 /**
70 * Adds bandwidth request with bandwidth value. 70 * Adds bandwidth request with bandwidth value.
...@@ -72,7 +72,7 @@ public interface LinkResourceRequest extends ResourceRequest { ...@@ -72,7 +72,7 @@ public interface LinkResourceRequest extends ResourceRequest {
72 * @param bandwidth bandwidth value to be requested 72 * @param bandwidth bandwidth value to be requested
73 * @return self 73 * @return self
74 */ 74 */
75 - public Builder addBandwidthRequest(double bandwidth); 75 + Builder addBandwidthRequest(double bandwidth);
76 76
77 /** 77 /**
78 * Adds the resources required for a constraint. 78 * Adds the resources required for a constraint.
...@@ -80,13 +80,13 @@ public interface LinkResourceRequest extends ResourceRequest { ...@@ -80,13 +80,13 @@ public interface LinkResourceRequest extends ResourceRequest {
80 * @param constraint the constraint 80 * @param constraint the constraint
81 * @return self 81 * @return self
82 */ 82 */
83 - public Builder addConstraint(Constraint constraint); 83 + Builder addConstraint(Constraint constraint);
84 84
85 /** 85 /**
86 * Returns link resource request. 86 * Returns link resource request.
87 * 87 *
88 * @return link resource request 88 * @return link resource request
89 */ 89 */
90 - public LinkResourceRequest build(); 90 + LinkResourceRequest build();
91 } 91 }
92 } 92 }
......
...@@ -32,7 +32,7 @@ public interface LinkResources { ...@@ -32,7 +32,7 @@ public interface LinkResources {
32 /** 32 /**
33 * Builder of {@link LinkResources}. 33 * Builder of {@link LinkResources}.
34 */ 34 */
35 - public interface Builder { 35 + interface Builder {
36 36
37 /** 37 /**
38 * Adds bandwidth resource. 38 * Adds bandwidth resource.
...@@ -43,7 +43,7 @@ public interface LinkResources { ...@@ -43,7 +43,7 @@ public interface LinkResources {
43 * @param bandwidth bandwidth value to be added 43 * @param bandwidth bandwidth value to be added
44 * @return self 44 * @return self
45 */ 45 */
46 - public Builder addBandwidth(double bandwidth); 46 + Builder addBandwidth(double bandwidth);
47 47
48 /** 48 /**
49 * Adds lambda resource. 49 * Adds lambda resource.
...@@ -51,13 +51,13 @@ public interface LinkResources { ...@@ -51,13 +51,13 @@ public interface LinkResources {
51 * @param lambda lambda value to be added 51 * @param lambda lambda value to be added
52 * @return self 52 * @return self
53 */ 53 */
54 - public Builder addLambda(int lambda); 54 + Builder addLambda(int lambda);
55 55
56 /** 56 /**
57 * Builds an immutable link resources. 57 * Builds an immutable link resources.
58 * 58 *
59 * @return link resources 59 * @return link resources
60 */ 60 */
61 - public LinkResources build(); 61 + LinkResources build();
62 } 62 }
63 } 63 }
......
...@@ -31,7 +31,7 @@ import org.onosproject.net.Provided; ...@@ -31,7 +31,7 @@ import org.onosproject.net.Provided;
31 public interface Label extends Annotated, Provided, NetworkResource { 31 public interface Label extends Annotated, Provided, NetworkResource {
32 32
33 /** Represents coarse Label type classification. */ 33 /** Represents coarse Label type classification. */
34 - public enum Type { 34 + enum Type {
35 /** 35 /**
36 * Signifies VLAN-based tag. 36 * Signifies VLAN-based tag.
37 */ 37 */
...@@ -109,4 +109,4 @@ public interface Label extends Annotated, Provided, NetworkResource { ...@@ -109,4 +109,4 @@ public interface Label extends Annotated, Provided, NetworkResource {
109 * @return label type 109 * @return label type
110 */ 110 */
111 Type type(); 111 Type type();
112 -}
...\ No newline at end of file ...\ No newline at end of file
112 +}
......
...@@ -33,7 +33,7 @@ public interface Tunnel extends Annotated, Provided, NetworkResource { ...@@ -33,7 +33,7 @@ public interface Tunnel extends Annotated, Provided, NetworkResource {
33 /** 33 /**
34 * Coarse representation of the Tunnel types. 34 * Coarse representation of the Tunnel types.
35 */ 35 */
36 - public enum Type { 36 + enum Type {
37 /** 37 /**
38 * Signifies that this is a L2 tunnel. 38 * Signifies that this is a L2 tunnel.
39 */ 39 */
...@@ -69,7 +69,7 @@ public interface Tunnel extends Annotated, Provided, NetworkResource { ...@@ -69,7 +69,7 @@ public interface Tunnel extends Annotated, Provided, NetworkResource {
69 * Representation of the tunnel state. 69 * Representation of the tunnel state.
70 * 70 *
71 */ 71 */
72 - public enum State { 72 + enum State {
73 73
74 /** 74 /**
75 * Signifies that a tunnel is currently in a initialized state. 75 * Signifies that a tunnel is currently in a initialized state.
......
...@@ -88,7 +88,7 @@ public interface TunnelStore extends Store<TunnelEvent, TunnelStoreDelegate> { ...@@ -88,7 +88,7 @@ public interface TunnelStore extends Store<TunnelEvent, TunnelStoreDelegate> {
88 * @param tunnel tunnel information 88 * @param tunnel tunnel information
89 * @return create tunnel event 89 * @return create tunnel event
90 */ 90 */
91 - public TunnelEvent addTunnel(ProviderId providerId, 91 + TunnelEvent addTunnel(ProviderId providerId,
92 Tunnel tunnel); 92 Tunnel tunnel);
93 93
94 /** 94 /**
...@@ -98,7 +98,7 @@ public interface TunnelStore extends Store<TunnelEvent, TunnelStoreDelegate> { ...@@ -98,7 +98,7 @@ public interface TunnelStore extends Store<TunnelEvent, TunnelStoreDelegate> {
98 * @param tunnel tunnel 98 * @param tunnel tunnel
99 * @return update tunnel event 99 * @return update tunnel event
100 */ 100 */
101 - public TunnelEvent updateTunnel(ProviderId providerId, 101 + TunnelEvent updateTunnel(ProviderId providerId,
102 Tunnel tunnel); 102 Tunnel tunnel);
103 103
104 /** 104 /**
......
...@@ -24,5 +24,5 @@ public interface ClusterMessageHandler { ...@@ -24,5 +24,5 @@ public interface ClusterMessageHandler {
24 * Handles/Processes the cluster message. 24 * Handles/Processes the cluster message.
25 * @param message cluster message. 25 * @param message cluster message.
26 */ 26 */
27 - public void handle(ClusterMessage message); 27 + void handle(ClusterMessage message);
28 } 28 }
......
...@@ -17,7 +17,7 @@ public interface AtomicCounterBuilder { ...@@ -17,7 +17,7 @@ public interface AtomicCounterBuilder {
17 * @param name name of the atomic counter 17 * @param name name of the atomic counter
18 * @return this AtomicCounterBuilder 18 * @return this AtomicCounterBuilder
19 */ 19 */
20 - public AtomicCounterBuilder withName(String name); 20 + AtomicCounterBuilder withName(String name);
21 21
22 /** 22 /**
23 * Creates this counter on the partition that spans the entire cluster. 23 * Creates this counter on the partition that spans the entire cluster.
...@@ -30,7 +30,7 @@ public interface AtomicCounterBuilder { ...@@ -30,7 +30,7 @@ public interface AtomicCounterBuilder {
30 * </p> 30 * </p>
31 * @return this AtomicCounterBuilder 31 * @return this AtomicCounterBuilder
32 */ 32 */
33 - public AtomicCounterBuilder withPartitionsDisabled(); 33 + AtomicCounterBuilder withPartitionsDisabled();
34 34
35 /** 35 /**
36 * Builds a AtomicCounter based on the configuration options 36 * Builds a AtomicCounter based on the configuration options
...@@ -39,7 +39,7 @@ public interface AtomicCounterBuilder { ...@@ -39,7 +39,7 @@ public interface AtomicCounterBuilder {
39 * @return new AtomicCounter 39 * @return new AtomicCounter
40 * @throws java.lang.RuntimeException if a mandatory parameter is missing 40 * @throws java.lang.RuntimeException if a mandatory parameter is missing
41 */ 41 */
42 - public AtomicCounter build(); 42 + AtomicCounter build();
43 43
44 /** 44 /**
45 * Builds a AsyncAtomicCounter based on the configuration options 45 * Builds a AsyncAtomicCounter based on the configuration options
...@@ -48,5 +48,5 @@ public interface AtomicCounterBuilder { ...@@ -48,5 +48,5 @@ public interface AtomicCounterBuilder {
48 * @return new AsyncAtomicCounter 48 * @return new AsyncAtomicCounter
49 * @throws java.lang.RuntimeException if a mandatory parameter is missing 49 * @throws java.lang.RuntimeException if a mandatory parameter is missing
50 */ 50 */
51 - public AsyncAtomicCounter buildAsyncCounter(); 51 + AsyncAtomicCounter buildAsyncCounter();
52 } 52 }
......
...@@ -31,5 +31,5 @@ public interface ClockService<T, U> { ...@@ -31,5 +31,5 @@ public interface ClockService<T, U> {
31 * @param object2 Second object to use when generating timestamps 31 * @param object2 Second object to use when generating timestamps
32 * @return the new timestamp 32 * @return the new timestamp
33 */ 33 */
34 - public Timestamp getTimestamp(T object1, U object2); 34 + Timestamp getTimestamp(T object1, U object2);
35 } 35 }
......
...@@ -21,7 +21,7 @@ public interface ConsistentMapBuilder<K, V> { ...@@ -21,7 +21,7 @@ public interface ConsistentMapBuilder<K, V> {
21 * @param name name of the consistent map 21 * @param name name of the consistent map
22 * @return this ConsistentMapBuilder 22 * @return this ConsistentMapBuilder
23 */ 23 */
24 - public ConsistentMapBuilder<K, V> withName(String name); 24 + ConsistentMapBuilder<K, V> withName(String name);
25 25
26 /** 26 /**
27 * Sets a serializer that can be used to serialize 27 * Sets a serializer that can be used to serialize
...@@ -35,7 +35,7 @@ public interface ConsistentMapBuilder<K, V> { ...@@ -35,7 +35,7 @@ public interface ConsistentMapBuilder<K, V> {
35 * @param serializer serializer 35 * @param serializer serializer
36 * @return this ConsistentMapBuilder 36 * @return this ConsistentMapBuilder
37 */ 37 */
38 - public ConsistentMapBuilder<K, V> withSerializer(Serializer serializer); 38 + ConsistentMapBuilder<K, V> withSerializer(Serializer serializer);
39 39
40 /** 40 /**
41 * Disables distribution of map entries across multiple database partitions. 41 * Disables distribution of map entries across multiple database partitions.
...@@ -53,7 +53,7 @@ public interface ConsistentMapBuilder<K, V> { ...@@ -53,7 +53,7 @@ public interface ConsistentMapBuilder<K, V> {
53 * </p> 53 * </p>
54 * @return this ConsistentMapBuilder 54 * @return this ConsistentMapBuilder
55 */ 55 */
56 - public ConsistentMapBuilder<K, V> withPartitionsDisabled(); 56 + ConsistentMapBuilder<K, V> withPartitionsDisabled();
57 57
58 /** 58 /**
59 * Disables map updates. 59 * Disables map updates.
...@@ -62,7 +62,7 @@ public interface ConsistentMapBuilder<K, V> { ...@@ -62,7 +62,7 @@ public interface ConsistentMapBuilder<K, V> {
62 * 62 *
63 * @return this ConsistentMapBuilder 63 * @return this ConsistentMapBuilder
64 */ 64 */
65 - public ConsistentMapBuilder<K, V> withUpdatesDisabled(); 65 + ConsistentMapBuilder<K, V> withUpdatesDisabled();
66 66
67 /** 67 /**
68 * Builds an consistent map based on the configuration options 68 * Builds an consistent map based on the configuration options
...@@ -71,7 +71,7 @@ public interface ConsistentMapBuilder<K, V> { ...@@ -71,7 +71,7 @@ public interface ConsistentMapBuilder<K, V> {
71 * @return new consistent map 71 * @return new consistent map
72 * @throws java.lang.RuntimeException if a mandatory parameter is missing 72 * @throws java.lang.RuntimeException if a mandatory parameter is missing
73 */ 73 */
74 - public ConsistentMap<K, V> build(); 74 + ConsistentMap<K, V> build();
75 75
76 /** 76 /**
77 * Builds an async consistent map based on the configuration options 77 * Builds an async consistent map based on the configuration options
...@@ -80,5 +80,5 @@ public interface ConsistentMapBuilder<K, V> { ...@@ -80,5 +80,5 @@ public interface ConsistentMapBuilder<K, V> {
80 * @return new async consistent map 80 * @return new async consistent map
81 * @throws java.lang.RuntimeException if a mandatory parameter is missing 81 * @throws java.lang.RuntimeException if a mandatory parameter is missing
82 */ 82 */
83 - public AsyncConsistentMap<K, V> buildAsyncMap();
84 -}
...\ No newline at end of file ...\ No newline at end of file
83 + AsyncConsistentMap<K, V> buildAsyncMap();
84 +}
......
...@@ -45,14 +45,14 @@ public interface EventuallyConsistentMap<K, V> { ...@@ -45,14 +45,14 @@ public interface EventuallyConsistentMap<K, V> {
45 * 45 *
46 * @return number of key-value mappings 46 * @return number of key-value mappings
47 */ 47 */
48 - public int size(); 48 + int size();
49 49
50 /** 50 /**
51 * Returns true if this map is empty. 51 * Returns true if this map is empty.
52 * 52 *
53 * @return true if this map is empty, otherwise false 53 * @return true if this map is empty, otherwise false
54 */ 54 */
55 - public boolean isEmpty(); 55 + boolean isEmpty();
56 56
57 /** 57 /**
58 * Returns true if the map contains a mapping for the specified key. 58 * Returns true if the map contains a mapping for the specified key.
...@@ -60,7 +60,7 @@ public interface EventuallyConsistentMap<K, V> { ...@@ -60,7 +60,7 @@ public interface EventuallyConsistentMap<K, V> {
60 * @param key the key to check if this map contains 60 * @param key the key to check if this map contains
61 * @return true if this map has a mapping for the key, otherwise false 61 * @return true if this map has a mapping for the key, otherwise false
62 */ 62 */
63 - public boolean containsKey(K key); 63 + boolean containsKey(K key);
64 64
65 /** 65 /**
66 * Returns true if the map contains a mapping from any key to the specified 66 * Returns true if the map contains a mapping from any key to the specified
...@@ -69,7 +69,7 @@ public interface EventuallyConsistentMap<K, V> { ...@@ -69,7 +69,7 @@ public interface EventuallyConsistentMap<K, V> {
69 * @param value the value to check if this map has a mapping for 69 * @param value the value to check if this map has a mapping for
70 * @return true if this map has a mapping to this value, otherwise false 70 * @return true if this map has a mapping to this value, otherwise false
71 */ 71 */
72 - public boolean containsValue(V value); 72 + boolean containsValue(V value);
73 73
74 /** 74 /**
75 * Returns the value mapped to the specified key. 75 * Returns the value mapped to the specified key.
...@@ -77,7 +77,7 @@ public interface EventuallyConsistentMap<K, V> { ...@@ -77,7 +77,7 @@ public interface EventuallyConsistentMap<K, V> {
77 * @param key the key to look up in this map 77 * @param key the key to look up in this map
78 * @return the value mapped to the key, or null if no mapping is found 78 * @return the value mapped to the key, or null if no mapping is found
79 */ 79 */
80 - public V get(K key); 80 + V get(K key);
81 81
82 /** 82 /**
83 * Associates the specified value to the specified key in this map. 83 * Associates the specified value to the specified key in this map.
...@@ -94,7 +94,7 @@ public interface EventuallyConsistentMap<K, V> { ...@@ -94,7 +94,7 @@ public interface EventuallyConsistentMap<K, V> {
94 * @param key the key to add a mapping for in this map 94 * @param key the key to add a mapping for in this map
95 * @param value the value to associate with the key in this map 95 * @param value the value to associate with the key in this map
96 */ 96 */
97 - public void put(K key, V value); 97 + void put(K key, V value);
98 98
99 /** 99 /**
100 * Removes the mapping associated with the specified key from the map. 100 * Removes the mapping associated with the specified key from the map.
...@@ -108,7 +108,7 @@ public interface EventuallyConsistentMap<K, V> { ...@@ -108,7 +108,7 @@ public interface EventuallyConsistentMap<K, V> {
108 * 108 *
109 * @param key the key to remove the mapping for 109 * @param key the key to remove the mapping for
110 */ 110 */
111 - public void remove(K key); 111 + void remove(K key);
112 112
113 /** 113 /**
114 * Removes the given key-value mapping from the map, if it exists. 114 * Removes the given key-value mapping from the map, if it exists.
...@@ -129,7 +129,7 @@ public interface EventuallyConsistentMap<K, V> { ...@@ -129,7 +129,7 @@ public interface EventuallyConsistentMap<K, V> {
129 * @param key the key to remove the mapping for 129 * @param key the key to remove the mapping for
130 * @param value the value mapped to the key 130 * @param value the value mapped to the key
131 */ 131 */
132 - public void remove(K key, V value); 132 + void remove(K key, V value);
133 133
134 /** 134 /**
135 * Adds mappings for all key-value pairs in the specified map to this map. 135 * Adds mappings for all key-value pairs in the specified map to this map.
...@@ -140,12 +140,12 @@ public interface EventuallyConsistentMap<K, V> { ...@@ -140,12 +140,12 @@ public interface EventuallyConsistentMap<K, V> {
140 * 140 *
141 * @param m a map of values to add to this map 141 * @param m a map of values to add to this map
142 */ 142 */
143 - public void putAll(Map<? extends K, ? extends V> m); 143 + void putAll(Map<? extends K, ? extends V> m);
144 144
145 /** 145 /**
146 * Removes all mappings from this map. 146 * Removes all mappings from this map.
147 */ 147 */
148 - public void clear(); 148 + void clear();
149 149
150 /** 150 /**
151 * Returns a set of the keys in this map. Changes to the set are not 151 * Returns a set of the keys in this map. Changes to the set are not
...@@ -153,7 +153,7 @@ public interface EventuallyConsistentMap<K, V> { ...@@ -153,7 +153,7 @@ public interface EventuallyConsistentMap<K, V> {
153 * 153 *
154 * @return set of keys in the map 154 * @return set of keys in the map
155 */ 155 */
156 - public Set<K> keySet(); 156 + Set<K> keySet();
157 157
158 /** 158 /**
159 * Returns a collections of values in this map. Changes to the collection 159 * Returns a collections of values in this map. Changes to the collection
...@@ -161,7 +161,7 @@ public interface EventuallyConsistentMap<K, V> { ...@@ -161,7 +161,7 @@ public interface EventuallyConsistentMap<K, V> {
161 * 161 *
162 * @return collection of values in the map 162 * @return collection of values in the map
163 */ 163 */
164 - public Collection<V> values(); 164 + Collection<V> values();
165 165
166 /** 166 /**
167 * Returns a set of mappings contained in this map. Changes to the set are 167 * Returns a set of mappings contained in this map. Changes to the set are
...@@ -169,7 +169,7 @@ public interface EventuallyConsistentMap<K, V> { ...@@ -169,7 +169,7 @@ public interface EventuallyConsistentMap<K, V> {
169 * 169 *
170 * @return set of key-value mappings in this map 170 * @return set of key-value mappings in this map
171 */ 171 */
172 - public Set<Map.Entry<K, V>> entrySet(); 172 + Set<Map.Entry<K, V>> entrySet();
173 173
174 /** 174 /**
175 * Adds the specified listener to the map which will be notified whenever 175 * Adds the specified listener to the map which will be notified whenever
...@@ -177,7 +177,7 @@ public interface EventuallyConsistentMap<K, V> { ...@@ -177,7 +177,7 @@ public interface EventuallyConsistentMap<K, V> {
177 * 177 *
178 * @param listener listener to register for events 178 * @param listener listener to register for events
179 */ 179 */
180 - public void addListener(EventuallyConsistentMapListener<K, V> listener); 180 + void addListener(EventuallyConsistentMapListener<K, V> listener);
181 181
182 /** 182 /**
183 * Removes the specified listener from the map such that it will no longer 183 * Removes the specified listener from the map such that it will no longer
...@@ -185,7 +185,7 @@ public interface EventuallyConsistentMap<K, V> { ...@@ -185,7 +185,7 @@ public interface EventuallyConsistentMap<K, V> {
185 * 185 *
186 * @param listener listener to deregister for events 186 * @param listener listener to deregister for events
187 */ 187 */
188 - public void removeListener(EventuallyConsistentMapListener<K, V> listener); 188 + void removeListener(EventuallyConsistentMapListener<K, V> listener);
189 189
190 /** 190 /**
191 * Shuts down the map and breaks communication between different instances. 191 * Shuts down the map and breaks communication between different instances.
...@@ -193,5 +193,5 @@ public interface EventuallyConsistentMap<K, V> { ...@@ -193,5 +193,5 @@ public interface EventuallyConsistentMap<K, V> {
193 * Calls to any methods on the map subsequent to calling destroy() will 193 * Calls to any methods on the map subsequent to calling destroy() will
194 * throw a {@link java.lang.RuntimeException}. 194 * throw a {@link java.lang.RuntimeException}.
195 */ 195 */
196 - public void destroy(); 196 + void destroy();
197 } 197 }
......
...@@ -48,7 +48,7 @@ public interface EventuallyConsistentMapBuilder<K, V> { ...@@ -48,7 +48,7 @@ public interface EventuallyConsistentMapBuilder<K, V> {
48 * @param name name of the map 48 * @param name name of the map
49 * @return this EventuallyConsistentMapBuilder 49 * @return this EventuallyConsistentMapBuilder
50 */ 50 */
51 - public EventuallyConsistentMapBuilder<K, V> withName(String name); 51 + EventuallyConsistentMapBuilder<K, V> withName(String name);
52 52
53 /** 53 /**
54 * Sets a serializer builder that can be used to create a serializer that 54 * Sets a serializer builder that can be used to create a serializer that
...@@ -62,7 +62,7 @@ public interface EventuallyConsistentMapBuilder<K, V> { ...@@ -62,7 +62,7 @@ public interface EventuallyConsistentMapBuilder<K, V> {
62 * @param serializerBuilder serializer builder 62 * @param serializerBuilder serializer builder
63 * @return this EventuallyConsistentMapBuilder 63 * @return this EventuallyConsistentMapBuilder
64 */ 64 */
65 - public EventuallyConsistentMapBuilder<K, V> withSerializer( 65 + EventuallyConsistentMapBuilder<K, V> withSerializer(
66 KryoNamespace.Builder serializerBuilder); 66 KryoNamespace.Builder serializerBuilder);
67 67
68 /** 68 /**
...@@ -83,7 +83,7 @@ public interface EventuallyConsistentMapBuilder<K, V> { ...@@ -83,7 +83,7 @@ public interface EventuallyConsistentMapBuilder<K, V> {
83 * @param clockService clock service 83 * @param clockService clock service
84 * @return this EventuallyConsistentMapBuilder 84 * @return this EventuallyConsistentMapBuilder
85 */ 85 */
86 - public EventuallyConsistentMapBuilder<K, V> withClockService( 86 + EventuallyConsistentMapBuilder<K, V> withClockService(
87 ClockService<K, V> clockService); 87 ClockService<K, V> clockService);
88 88
89 /** 89 /**
...@@ -92,7 +92,7 @@ public interface EventuallyConsistentMapBuilder<K, V> { ...@@ -92,7 +92,7 @@ public interface EventuallyConsistentMapBuilder<K, V> {
92 * @param executor event executor 92 * @param executor event executor
93 * @return this EventuallyConsistentMapBuilder 93 * @return this EventuallyConsistentMapBuilder
94 */ 94 */
95 - public EventuallyConsistentMapBuilder<K, V> withEventExecutor( 95 + EventuallyConsistentMapBuilder<K, V> withEventExecutor(
96 ExecutorService executor); 96 ExecutorService executor);
97 97
98 /** 98 /**
...@@ -101,7 +101,7 @@ public interface EventuallyConsistentMapBuilder<K, V> { ...@@ -101,7 +101,7 @@ public interface EventuallyConsistentMapBuilder<K, V> {
101 * @param executor event executor 101 * @param executor event executor
102 * @return this EventuallyConsistentMapBuilder 102 * @return this EventuallyConsistentMapBuilder
103 */ 103 */
104 - public EventuallyConsistentMapBuilder<K, V> withCommunicationExecutor( 104 + EventuallyConsistentMapBuilder<K, V> withCommunicationExecutor(
105 ExecutorService executor); 105 ExecutorService executor);
106 106
107 /** 107 /**
...@@ -110,7 +110,7 @@ public interface EventuallyConsistentMapBuilder<K, V> { ...@@ -110,7 +110,7 @@ public interface EventuallyConsistentMapBuilder<K, V> {
110 * @param executor event executor 110 * @param executor event executor
111 * @return this EventuallyConsistentMapBuilder 111 * @return this EventuallyConsistentMapBuilder
112 */ 112 */
113 - public EventuallyConsistentMapBuilder<K, V> withBackgroundExecutor( 113 + EventuallyConsistentMapBuilder<K, V> withBackgroundExecutor(
114 ScheduledExecutorService executor); 114 ScheduledExecutorService executor);
115 115
116 /** 116 /**
...@@ -124,7 +124,7 @@ public interface EventuallyConsistentMapBuilder<K, V> { ...@@ -124,7 +124,7 @@ public interface EventuallyConsistentMapBuilder<K, V> {
124 * to 124 * to
125 * @return this EventuallyConsistentMapBuilder 125 * @return this EventuallyConsistentMapBuilder
126 */ 126 */
127 - public EventuallyConsistentMapBuilder<K, V> withPeerUpdateFunction( 127 + EventuallyConsistentMapBuilder<K, V> withPeerUpdateFunction(
128 BiFunction<K, V, Collection<NodeId>> peerUpdateFunction); 128 BiFunction<K, V, Collection<NodeId>> peerUpdateFunction);
129 129
130 /** 130 /**
...@@ -137,7 +137,7 @@ public interface EventuallyConsistentMapBuilder<K, V> { ...@@ -137,7 +137,7 @@ public interface EventuallyConsistentMapBuilder<K, V> {
137 * 137 *
138 * @return this EventuallyConsistentMapBuilder 138 * @return this EventuallyConsistentMapBuilder
139 */ 139 */
140 - public EventuallyConsistentMapBuilder<K, V> withTombstonesDisabled(); 140 + EventuallyConsistentMapBuilder<K, V> withTombstonesDisabled();
141 141
142 /** 142 /**
143 * Configures how often to run the anti-entropy background task. 143 * Configures how often to run the anti-entropy background task.
...@@ -149,7 +149,7 @@ public interface EventuallyConsistentMapBuilder<K, V> { ...@@ -149,7 +149,7 @@ public interface EventuallyConsistentMapBuilder<K, V> {
149 * @param unit time unit for the period 149 * @param unit time unit for the period
150 * @return this EventuallyConsistentMapBuilder 150 * @return this EventuallyConsistentMapBuilder
151 */ 151 */
152 - public EventuallyConsistentMapBuilder<K, V> withAntiEntropyPeriod( 152 + EventuallyConsistentMapBuilder<K, V> withAntiEntropyPeriod(
153 long period, TimeUnit unit); 153 long period, TimeUnit unit);
154 154
155 /** 155 /**
...@@ -163,7 +163,7 @@ public interface EventuallyConsistentMapBuilder<K, V> { ...@@ -163,7 +163,7 @@ public interface EventuallyConsistentMapBuilder<K, V> {
163 * 163 *
164 * @return this EventuallyConsistentMapBuilder 164 * @return this EventuallyConsistentMapBuilder
165 */ 165 */
166 - public EventuallyConsistentMapBuilder<K, V> withFasterConvergence(); 166 + EventuallyConsistentMapBuilder<K, V> withFasterConvergence();
167 167
168 /** 168 /**
169 * Configure the map to persist data to disk. 169 * Configure the map to persist data to disk.
...@@ -173,7 +173,7 @@ public interface EventuallyConsistentMapBuilder<K, V> { ...@@ -173,7 +173,7 @@ public interface EventuallyConsistentMapBuilder<K, V> {
173 * 173 *
174 * @return this EventuallyConsistentMapBuilder 174 * @return this EventuallyConsistentMapBuilder
175 */ 175 */
176 - public EventuallyConsistentMapBuilder<K, V> withPersistence(); 176 + EventuallyConsistentMapBuilder<K, V> withPersistence();
177 177
178 /** 178 /**
179 * Builds an eventually consistent map based on the configuration options 179 * Builds an eventually consistent map based on the configuration options
...@@ -182,5 +182,5 @@ public interface EventuallyConsistentMapBuilder<K, V> { ...@@ -182,5 +182,5 @@ public interface EventuallyConsistentMapBuilder<K, V> {
182 * @return new eventually consistent map 182 * @return new eventually consistent map
183 * @throws java.lang.RuntimeException if a mandatory parameter is missing 183 * @throws java.lang.RuntimeException if a mandatory parameter is missing
184 */ 184 */
185 - public EventuallyConsistentMap<K, V> build(); 185 + EventuallyConsistentMap<K, V> build();
186 } 186 }
......
...@@ -26,5 +26,5 @@ public interface EventuallyConsistentMapListener<K, V> { ...@@ -26,5 +26,5 @@ public interface EventuallyConsistentMapListener<K, V> {
26 * 26 *
27 * @param event the event 27 * @param event the event
28 */ 28 */
29 - public void event(EventuallyConsistentMapEvent<K, V> event); 29 + void event(EventuallyConsistentMapEvent<K, V> event);
30 } 30 }
......
...@@ -44,7 +44,7 @@ public interface Serializer { ...@@ -44,7 +44,7 @@ public interface Serializer {
44 * @param kryo kryo namespace 44 * @param kryo kryo namespace
45 * @return Serializer instance 45 * @return Serializer instance
46 */ 46 */
47 - public static Serializer using(KryoNamespace kryo) { 47 + static Serializer using(KryoNamespace kryo) {
48 return new Serializer() { 48 return new Serializer() {
49 @Override 49 @Override
50 public <T> byte[] encode(T object) { 50 public <T> byte[] encode(T object) {
...@@ -57,4 +57,4 @@ public interface Serializer { ...@@ -57,4 +57,4 @@ public interface Serializer {
57 } 57 }
58 }; 58 };
59 } 59 }
60 -}
...\ No newline at end of file ...\ No newline at end of file
60 +}
......
...@@ -36,7 +36,7 @@ public interface SetBuilder<E> { ...@@ -36,7 +36,7 @@ public interface SetBuilder<E> {
36 * @param name name of the set 36 * @param name name of the set
37 * @return this SetBuilder 37 * @return this SetBuilder
38 */ 38 */
39 - public SetBuilder<E> withName(String name); 39 + SetBuilder<E> withName(String name);
40 40
41 /** 41 /**
42 * Sets a serializer that can be used to serialize 42 * Sets a serializer that can be used to serialize
...@@ -50,7 +50,7 @@ public interface SetBuilder<E> { ...@@ -50,7 +50,7 @@ public interface SetBuilder<E> {
50 * @param serializer serializer 50 * @param serializer serializer
51 * @return this SetBuilder 51 * @return this SetBuilder
52 */ 52 */
53 - public SetBuilder<E> withSerializer(Serializer serializer); 53 + SetBuilder<E> withSerializer(Serializer serializer);
54 54
55 /** 55 /**
56 * Disables set updates. 56 * Disables set updates.
...@@ -68,5 +68,5 @@ public interface SetBuilder<E> { ...@@ -68,5 +68,5 @@ public interface SetBuilder<E> {
68 * @return new set 68 * @return new set
69 * @throws java.lang.RuntimeException if a mandatory parameter is missing 69 * @throws java.lang.RuntimeException if a mandatory parameter is missing
70 */ 70 */
71 - public Set<E> build();
72 -}
...\ No newline at end of file ...\ No newline at end of file
71 + Set<E> build();
72 +}
......
...@@ -22,7 +22,7 @@ import java.util.List; ...@@ -22,7 +22,7 @@ import java.util.List;
22 */ 22 */
23 public interface Transaction { 23 public interface Transaction {
24 24
25 - public enum State { 25 + enum State {
26 /** 26 /**
27 * Indicates a new transaction that is about to be prepared. All transactions 27 * Indicates a new transaction that is about to be prepared. All transactions
28 * start their life in this state. 28 * start their life in this state.
...@@ -81,7 +81,7 @@ public interface Transaction { ...@@ -81,7 +81,7 @@ public interface Transaction {
81 * 81 *
82 * @return true is yes, false otherwise 82 * @return true is yes, false otherwise
83 */ 83 */
84 - public default boolean isDone() { 84 + default boolean isDone() {
85 return state() == State.COMMITTED || state() == State.ROLLEDBACK; 85 return state() == State.COMMITTED || state() == State.ROLLEDBACK;
86 } 86 }
87 87
...@@ -98,5 +98,5 @@ public interface Transaction { ...@@ -98,5 +98,5 @@ public interface Transaction {
98 * 98 *
99 * @return last update time 99 * @return last update time
100 */ 100 */
101 - public long lastUpdated();
102 -}
...\ No newline at end of file ...\ No newline at end of file
101 + long lastUpdated();
102 +}
......
...@@ -19,7 +19,7 @@ public interface TransactionContextBuilder { ...@@ -19,7 +19,7 @@ public interface TransactionContextBuilder {
19 * 19 *
20 * @return this TransactionalContextBuilder 20 * @return this TransactionalContextBuilder
21 */ 21 */
22 - public TransactionContextBuilder withPartitionsDisabled(); 22 + TransactionContextBuilder withPartitionsDisabled();
23 23
24 /** 24 /**
25 * Builds a TransactionContext based on configuration options supplied to this 25 * Builds a TransactionContext based on configuration options supplied to this
...@@ -28,5 +28,5 @@ public interface TransactionContextBuilder { ...@@ -28,5 +28,5 @@ public interface TransactionContextBuilder {
28 * @return a new TransactionalContext 28 * @return a new TransactionalContext
29 * @throws java.lang.RuntimeException if a mandatory parameter is missing 29 * @throws java.lang.RuntimeException if a mandatory parameter is missing
30 */ 30 */
31 - public TransactionContext build(); 31 + TransactionContext build();
32 } 32 }
......
...@@ -47,7 +47,7 @@ public interface ObjectiveTrackerService { ...@@ -47,7 +47,7 @@ public interface ObjectiveTrackerService {
47 * @param resources resources to track 47 * @param resources resources to track
48 */ 48 */
49 // TODO consider using the IntentData here rather than just the key 49 // TODO consider using the IntentData here rather than just the key
50 - public void addTrackedResources(Key intentKey, 50 + void addTrackedResources(Key intentKey,
51 Collection<NetworkResource> resources); 51 Collection<NetworkResource> resources);
52 52
53 /** 53 /**
...@@ -56,7 +56,7 @@ public interface ObjectiveTrackerService { ...@@ -56,7 +56,7 @@ public interface ObjectiveTrackerService {
56 * @param intentKey intent identity on whose behalf the path is being tracked 56 * @param intentKey intent identity on whose behalf the path is being tracked
57 * @param resources resources to stop tracking 57 * @param resources resources to stop tracking
58 */ 58 */
59 - public void removeTrackedResources(Key intentKey, 59 + void removeTrackedResources(Key intentKey,
60 Collection<NetworkResource> resources); 60 Collection<NetworkResource> resources);
61 61
62 } 62 }
......
...@@ -41,7 +41,7 @@ public interface DatabaseState<K, V> { ...@@ -41,7 +41,7 @@ public interface DatabaseState<K, V> {
41 * @param context The map state context. 41 * @param context The map state context.
42 */ 42 */
43 @Initializer 43 @Initializer
44 - public void init(StateContext<DatabaseState<K, V>> context); 44 + void init(StateContext<DatabaseState<K, V>> context);
45 45
46 @Query 46 @Query
47 Set<String> tableNames(); 47 Set<String> tableNames();
......
...@@ -31,7 +31,7 @@ public interface StoreSerializer { ...@@ -31,7 +31,7 @@ public interface StoreSerializer {
31 * @param obj object to be serialized 31 * @param obj object to be serialized
32 * @return serialized bytes 32 * @return serialized bytes
33 */ 33 */
34 - public byte[] encode(final Object obj); 34 + byte[] encode(final Object obj);
35 35
36 /** 36 /**
37 * Serializes the specified object into bytes. 37 * Serializes the specified object into bytes.
...@@ -39,7 +39,7 @@ public interface StoreSerializer { ...@@ -39,7 +39,7 @@ public interface StoreSerializer {
39 * @param obj object to be serialized 39 * @param obj object to be serialized
40 * @param buffer to write serialized bytes 40 * @param buffer to write serialized bytes
41 */ 41 */
42 - public void encode(final Object obj, ByteBuffer buffer); 42 + void encode(final Object obj, ByteBuffer buffer);
43 43
44 /** 44 /**
45 * Serializes the specified object into bytes. 45 * Serializes the specified object into bytes.
...@@ -47,7 +47,7 @@ public interface StoreSerializer { ...@@ -47,7 +47,7 @@ public interface StoreSerializer {
47 * @param obj object to be serialized 47 * @param obj object to be serialized
48 * @param stream to write serialized bytes 48 * @param stream to write serialized bytes
49 */ 49 */
50 - public void encode(final Object obj, final OutputStream stream); 50 + void encode(final Object obj, final OutputStream stream);
51 51
52 /** 52 /**
53 * Deserializes the specified bytes into an object. 53 * Deserializes the specified bytes into an object.
...@@ -56,7 +56,7 @@ public interface StoreSerializer { ...@@ -56,7 +56,7 @@ public interface StoreSerializer {
56 * @return deserialized object 56 * @return deserialized object
57 * @param <T> decoded type 57 * @param <T> decoded type
58 */ 58 */
59 - public <T> T decode(final byte[] bytes); 59 + <T> T decode(final byte[] bytes);
60 60
61 /** 61 /**
62 * Deserializes the specified bytes into an object. 62 * Deserializes the specified bytes into an object.
...@@ -65,7 +65,7 @@ public interface StoreSerializer { ...@@ -65,7 +65,7 @@ public interface StoreSerializer {
65 * @return deserialized object 65 * @return deserialized object
66 * @param <T> decoded type 66 * @param <T> decoded type
67 */ 67 */
68 - public <T> T decode(final ByteBuffer buffer); 68 + <T> T decode(final ByteBuffer buffer);
69 69
70 /** 70 /**
71 * Deserializes the specified bytes into an object. 71 * Deserializes the specified bytes into an object.
...@@ -74,5 +74,5 @@ public interface StoreSerializer { ...@@ -74,5 +74,5 @@ public interface StoreSerializer {
74 * @return deserialized object 74 * @return deserialized object
75 * @param <T> decoded type 75 * @param <T> decoded type
76 */ 76 */
77 - public <T> T decode(final InputStream stream); 77 + <T> T decode(final InputStream stream);
78 } 78 }
......
...@@ -34,14 +34,14 @@ public interface OpenFlowAgent { ...@@ -34,14 +34,14 @@ public interface OpenFlowAgent {
34 * @param sw the actual switch object. 34 * @param sw the actual switch object.
35 * @return true if added, false otherwise. 35 * @return true if added, false otherwise.
36 */ 36 */
37 - public boolean addConnectedSwitch(Dpid dpid, OpenFlowSwitch sw); 37 + boolean addConnectedSwitch(Dpid dpid, OpenFlowSwitch sw);
38 38
39 /** 39 /**
40 * Checks if the activation for this switch is valid. 40 * Checks if the activation for this switch is valid.
41 * @param dpid the dpid to check 41 * @param dpid the dpid to check
42 * @return true if valid, false otherwise 42 * @return true if valid, false otherwise
43 */ 43 */
44 - public boolean validActivation(Dpid dpid); 44 + boolean validActivation(Dpid dpid);
45 45
46 /** 46 /**
47 * Called when a switch is activated, with this controller's role as MASTER. 47 * Called when a switch is activated, with this controller's role as MASTER.
...@@ -49,7 +49,7 @@ public interface OpenFlowAgent { ...@@ -49,7 +49,7 @@ public interface OpenFlowAgent {
49 * @param sw the actual switch 49 * @param sw the actual switch
50 * @return true if added, false otherwise. 50 * @return true if added, false otherwise.
51 */ 51 */
52 - public boolean addActivatedMasterSwitch(Dpid dpid, OpenFlowSwitch sw); 52 + boolean addActivatedMasterSwitch(Dpid dpid, OpenFlowSwitch sw);
53 53
54 /** 54 /**
55 * Called when a switch is activated, with this controller's role as EQUAL. 55 * Called when a switch is activated, with this controller's role as EQUAL.
...@@ -57,7 +57,7 @@ public interface OpenFlowAgent { ...@@ -57,7 +57,7 @@ public interface OpenFlowAgent {
57 * @param sw the actual switch 57 * @param sw the actual switch
58 * @return true if added, false otherwise. 58 * @return true if added, false otherwise.
59 */ 59 */
60 - public boolean addActivatedEqualSwitch(Dpid dpid, OpenFlowSwitch sw); 60 + boolean addActivatedEqualSwitch(Dpid dpid, OpenFlowSwitch sw);
61 61
62 /** 62 /**
63 * Called when this controller's role for a switch transitions from equal 63 * Called when this controller's role for a switch transitions from equal
...@@ -65,7 +65,7 @@ public interface OpenFlowAgent { ...@@ -65,7 +65,7 @@ public interface OpenFlowAgent {
65 * 'equal' - so this transition is equivalent to 'addActivatedMasterSwitch'. 65 * 'equal' - so this transition is equivalent to 'addActivatedMasterSwitch'.
66 * @param dpid the dpid to transistion. 66 * @param dpid the dpid to transistion.
67 */ 67 */
68 - public void transitionToMasterSwitch(Dpid dpid); 68 + void transitionToMasterSwitch(Dpid dpid);
69 69
70 /** 70 /**
71 * Called when this controller's role for a switch transitions to equal. 71 * Called when this controller's role for a switch transitions to equal.
...@@ -73,7 +73,7 @@ public interface OpenFlowAgent { ...@@ -73,7 +73,7 @@ public interface OpenFlowAgent {
73 * 'equal'. 73 * 'equal'.
74 * @param dpid the dpid to transistion. 74 * @param dpid the dpid to transistion.
75 */ 75 */
76 - public void transitionToEqualSwitch(Dpid dpid); 76 + void transitionToEqualSwitch(Dpid dpid);
77 77
78 /** 78 /**
79 * Clear all state in controller switch maps for a switch that has 79 * Clear all state in controller switch maps for a switch that has
...@@ -81,7 +81,7 @@ public interface OpenFlowAgent { ...@@ -81,7 +81,7 @@ public interface OpenFlowAgent {
81 * that switch from the global repository. Notify switch listeners. 81 * that switch from the global repository. Notify switch listeners.
82 * @param dpid the dpid to remove. 82 * @param dpid the dpid to remove.
83 */ 83 */
84 - public void removeConnectedSwitch(Dpid dpid); 84 + void removeConnectedSwitch(Dpid dpid);
85 85
86 /** 86 /**
87 * Process a message coming from a switch. 87 * Process a message coming from a switch.
...@@ -89,7 +89,7 @@ public interface OpenFlowAgent { ...@@ -89,7 +89,7 @@ public interface OpenFlowAgent {
89 * @param dpid the dpid the message came on. 89 * @param dpid the dpid the message came on.
90 * @param m the message to process 90 * @param m the message to process
91 */ 91 */
92 - public void processMessage(Dpid dpid, OFMessage m); 92 + void processMessage(Dpid dpid, OFMessage m);
93 93
94 /** 94 /**
95 * Notifies the controller that role assertion has failed. 95 * Notifies the controller that role assertion has failed.
...@@ -98,5 +98,5 @@ public interface OpenFlowAgent { ...@@ -98,5 +98,5 @@ public interface OpenFlowAgent {
98 * @param requested the role controller requested 98 * @param requested the role controller requested
99 * @param response role reply from the switch 99 * @param response role reply from the switch
100 */ 100 */
101 - public void returnRoleReply(Dpid dpid, RoleState requested, RoleState response); 101 + void returnRoleReply(Dpid dpid, RoleState requested, RoleState response);
102 } 102 }
......
...@@ -40,28 +40,28 @@ public interface OpenFlowSwitchDriver extends OpenFlowSwitch, HandlerBehaviour { ...@@ -40,28 +40,28 @@ public interface OpenFlowSwitchDriver extends OpenFlowSwitch, HandlerBehaviour {
40 * can only be called once. 40 * can only be called once.
41 * @param agent the agent to set. 41 * @param agent the agent to set.
42 */ 42 */
43 - public void setAgent(OpenFlowAgent agent); 43 + void setAgent(OpenFlowAgent agent);
44 44
45 /** 45 /**
46 * Sets the Role handler object. 46 * Sets the Role handler object.
47 * This method can only be called once. 47 * This method can only be called once.
48 * @param roleHandler the roleHandler class 48 * @param roleHandler the roleHandler class
49 */ 49 */
50 - public void setRoleHandler(RoleHandler roleHandler); 50 + void setRoleHandler(RoleHandler roleHandler);
51 51
52 /** 52 /**
53 * Reasserts this controllers role to the switch. 53 * Reasserts this controllers role to the switch.
54 * Useful in cases where the switch no longer agrees 54 * Useful in cases where the switch no longer agrees
55 * that this controller has the role it claims. 55 * that this controller has the role it claims.
56 */ 56 */
57 - public void reassertRole(); 57 + void reassertRole();
58 58
59 /** 59 /**
60 * Handle the situation where the role request triggers an error. 60 * Handle the situation where the role request triggers an error.
61 * @param error the error to handle. 61 * @param error the error to handle.
62 * @return true if handled, false if not. 62 * @return true if handled, false if not.
63 */ 63 */
64 - public boolean handleRoleError(OFErrorMsg error); 64 + boolean handleRoleError(OFErrorMsg error);
65 65
66 /** 66 /**
67 * If this driver know of Nicira style role messages, these should 67 * If this driver know of Nicira style role messages, these should
...@@ -70,7 +70,7 @@ public interface OpenFlowSwitchDriver extends OpenFlowSwitch, HandlerBehaviour { ...@@ -70,7 +70,7 @@ public interface OpenFlowSwitchDriver extends OpenFlowSwitch, HandlerBehaviour {
70 * @throws SwitchStateException if the message received was 70 * @throws SwitchStateException if the message received was
71 * not a nicira role or was malformed. 71 * not a nicira role or was malformed.
72 */ 72 */
73 - public void handleNiciraRole(OFMessage m) throws SwitchStateException; 73 + void handleNiciraRole(OFMessage m) throws SwitchStateException;
74 74
75 /** 75 /**
76 * Handle OF 1.x (where x &gt; 0) role messages. 76 * Handle OF 1.x (where x &gt; 0) role messages.
...@@ -78,98 +78,98 @@ public interface OpenFlowSwitchDriver extends OpenFlowSwitch, HandlerBehaviour { ...@@ -78,98 +78,98 @@ public interface OpenFlowSwitchDriver extends OpenFlowSwitch, HandlerBehaviour {
78 * @throws SwitchStateException if the message received was 78 * @throws SwitchStateException if the message received was
79 * not a nicira role or was malformed. 79 * not a nicira role or was malformed.
80 */ 80 */
81 - public void handleRole(OFMessage m) throws SwitchStateException; 81 + void handleRole(OFMessage m) throws SwitchStateException;
82 82
83 /** 83 /**
84 * Announce to the OpenFlow agent that this switch has connected. 84 * Announce to the OpenFlow agent that this switch has connected.
85 * @return true if successful, false if duplicate switch. 85 * @return true if successful, false if duplicate switch.
86 */ 86 */
87 - public boolean connectSwitch(); 87 + boolean connectSwitch();
88 88
89 /** 89 /**
90 * Activate this MASTER switch-controller relationship in the OF agent. 90 * Activate this MASTER switch-controller relationship in the OF agent.
91 * @return true is successful, false is switch has not 91 * @return true is successful, false is switch has not
92 * connected or is unknown to the system. 92 * connected or is unknown to the system.
93 */ 93 */
94 - public boolean activateMasterSwitch(); 94 + boolean activateMasterSwitch();
95 95
96 /** 96 /**
97 * Activate this EQUAL switch-controller relationship in the OF agent. 97 * Activate this EQUAL switch-controller relationship in the OF agent.
98 * @return true is successful, false is switch has not 98 * @return true is successful, false is switch has not
99 * connected or is unknown to the system. 99 * connected or is unknown to the system.
100 */ 100 */
101 - public boolean activateEqualSwitch(); 101 + boolean activateEqualSwitch();
102 102
103 /** 103 /**
104 * Transition this switch-controller relationship to an EQUAL state. 104 * Transition this switch-controller relationship to an EQUAL state.
105 */ 105 */
106 - public void transitionToEqualSwitch(); 106 + void transitionToEqualSwitch();
107 107
108 /** 108 /**
109 * Transition this switch-controller relationship to an Master state. 109 * Transition this switch-controller relationship to an Master state.
110 */ 110 */
111 - public void transitionToMasterSwitch(); 111 + void transitionToMasterSwitch();
112 112
113 /** 113 /**
114 * Remove this switch from the openflow agent. 114 * Remove this switch from the openflow agent.
115 */ 115 */
116 - public void removeConnectedSwitch(); 116 + void removeConnectedSwitch();
117 117
118 /** 118 /**
119 * Sets the ports on this switch. 119 * Sets the ports on this switch.
120 * @param portDescReply the port set and descriptions 120 * @param portDescReply the port set and descriptions
121 */ 121 */
122 - public void setPortDescReply(OFPortDescStatsReply portDescReply); 122 + void setPortDescReply(OFPortDescStatsReply portDescReply);
123 123
124 /** 124 /**
125 * Sets the ports on this switch. 125 * Sets the ports on this switch.
126 * @param portDescReplies list of port set and descriptions 126 * @param portDescReplies list of port set and descriptions
127 */ 127 */
128 - public void setPortDescReplies(List<OFPortDescStatsReply> portDescReplies); 128 + void setPortDescReplies(List<OFPortDescStatsReply> portDescReplies);
129 129
130 /** 130 /**
131 * Sets the features reply for this switch. 131 * Sets the features reply for this switch.
132 * @param featuresReply the features to set. 132 * @param featuresReply the features to set.
133 */ 133 */
134 - public void setFeaturesReply(OFFeaturesReply featuresReply); 134 + void setFeaturesReply(OFFeaturesReply featuresReply);
135 135
136 /** 136 /**
137 * Sets the switch description. 137 * Sets the switch description.
138 * @param desc the descriptions 138 * @param desc the descriptions
139 */ 139 */
140 - public void setSwitchDescription(OFDescStatsReply desc); 140 + void setSwitchDescription(OFDescStatsReply desc);
141 141
142 /** 142 /**
143 * Gets the next transaction id to use. 143 * Gets the next transaction id to use.
144 * @return the xid 144 * @return the xid
145 */ 145 */
146 - public int getNextTransactionId(); 146 + int getNextTransactionId();
147 147
148 148
149 /** 149 /**
150 * Sets the OF version for this switch. 150 * Sets the OF version for this switch.
151 * @param ofV the version to set. 151 * @param ofV the version to set.
152 */ 152 */
153 - public void setOFVersion(OFVersion ofV); 153 + void setOFVersion(OFVersion ofV);
154 154
155 /** 155 /**
156 * Sets this switch has having a full flowtable. 156 * Sets this switch has having a full flowtable.
157 * @param full true if full, false otherswise. 157 * @param full true if full, false otherswise.
158 */ 158 */
159 - public void setTableFull(boolean full); 159 + void setTableFull(boolean full);
160 160
161 /** 161 /**
162 * Sets the associated Netty channel for this switch. 162 * Sets the associated Netty channel for this switch.
163 * @param channel the Netty channel 163 * @param channel the Netty channel
164 */ 164 */
165 - public void setChannel(Channel channel); 165 + void setChannel(Channel channel);
166 166
167 /** 167 /**
168 * Sets whether the switch is connected. 168 * Sets whether the switch is connected.
169 * 169 *
170 * @param connected whether the switch is connected 170 * @param connected whether the switch is connected
171 */ 171 */
172 - public void setConnected(boolean connected); 172 + void setConnected(boolean connected);
173 173
174 /** 174 /**
175 * Initialises the behaviour. 175 * Initialises the behaviour.
......
...@@ -34,6 +34,6 @@ public interface OpenFlowSwitchDriverFactory { ...@@ -34,6 +34,6 @@ public interface OpenFlowSwitchDriverFactory {
34 * @param ofv the OF version in use 34 * @param ofv the OF version in use
35 * @return the openflow switch representation. 35 * @return the openflow switch representation.
36 */ 36 */
37 - public OpenFlowSwitchDriver getOFSwitchImpl(Dpid dpid, 37 + OpenFlowSwitchDriver getOFSwitchImpl(Dpid dpid,
38 OFDescStatsReply desc, OFVersion ofv); 38 OFDescStatsReply desc, OFVersion ofv);
39 } 39 }
......
...@@ -40,7 +40,7 @@ public interface RoleHandler { ...@@ -40,7 +40,7 @@ public interface RoleHandler {
40 * @throws SwitchStateException If the message is a Nicira role reply 40 * @throws SwitchStateException If the message is a Nicira role reply
41 * but the numeric role value is unknown. 41 * but the numeric role value is unknown.
42 */ 42 */
43 - public RoleState extractNiciraRoleReply(OFExperimenter experimenterMsg) 43 + RoleState extractNiciraRoleReply(OFExperimenter experimenterMsg)
44 throws SwitchStateException; 44 throws SwitchStateException;
45 45
46 /** 46 /**
...@@ -64,7 +64,7 @@ public interface RoleHandler { ...@@ -64,7 +64,7 @@ public interface RoleHandler {
64 * @return false if and only if the switch does not support role-request 64 * @return false if and only if the switch does not support role-request
65 * messages, according to the switch driver; true otherwise. 65 * messages, according to the switch driver; true otherwise.
66 */ 66 */
67 - public boolean sendRoleRequest(RoleState role, RoleRecvStatus exp) 67 + boolean sendRoleRequest(RoleState role, RoleRecvStatus exp)
68 throws IOException; 68 throws IOException;
69 69
70 /** 70 /**
...@@ -73,7 +73,7 @@ public interface RoleHandler { ...@@ -73,7 +73,7 @@ public interface RoleHandler {
73 * @return RoleReplyInfo object 73 * @return RoleReplyInfo object
74 * @throws SwitchStateException If unknown role encountered 74 * @throws SwitchStateException If unknown role encountered
75 */ 75 */
76 - public RoleReplyInfo extractOFRoleReply(OFRoleReply rrmsg) 76 + RoleReplyInfo extractOFRoleReply(OFRoleReply rrmsg)
77 throws SwitchStateException; 77 throws SwitchStateException;
78 78
79 /** 79 /**
...@@ -93,7 +93,7 @@ public interface RoleHandler { ...@@ -93,7 +93,7 @@ public interface RoleHandler {
93 * @return result comparing expected and received reply 93 * @return result comparing expected and received reply
94 * @throws SwitchStateException if no request is pending 94 * @throws SwitchStateException if no request is pending
95 */ 95 */
96 - public RoleRecvStatus deliverRoleReply(RoleReplyInfo rri) 96 + RoleRecvStatus deliverRoleReply(RoleReplyInfo rri)
97 throws SwitchStateException; 97 throws SwitchStateException;
98 98
99 99
...@@ -108,7 +108,7 @@ public interface RoleHandler { ...@@ -108,7 +108,7 @@ public interface RoleHandler {
108 * @return result comparing expected and received reply 108 * @return result comparing expected and received reply
109 * @throws SwitchStateException if switch did not support requested role 109 * @throws SwitchStateException if switch did not support requested role
110 */ 110 */
111 - public RoleRecvStatus deliverError(OFErrorMsg error) 111 + RoleRecvStatus deliverError(OFErrorMsg error)
112 throws SwitchStateException; 112 throws SwitchStateException;
113 113
114 } 114 }
......
...@@ -26,26 +26,26 @@ import java.util.Set; ...@@ -26,26 +26,26 @@ import java.util.Set;
26 */ 26 */
27 public interface GraphPathSearch<V extends Vertex, E extends Edge<V>> { 27 public interface GraphPathSearch<V extends Vertex, E extends Edge<V>> {
28 28
29 - public static int ALL_PATHS = -1; 29 + static int ALL_PATHS = -1;
30 30
31 /** 31 /**
32 * Abstraction of a path search result. 32 * Abstraction of a path search result.
33 */ 33 */
34 - public interface Result<V extends Vertex, E extends Edge<V>> { 34 + interface Result<V extends Vertex, E extends Edge<V>> {
35 35
36 /** 36 /**
37 * Returns the search source. 37 * Returns the search source.
38 * 38 *
39 * @return search source 39 * @return search source
40 */ 40 */
41 - public V src(); 41 + V src();
42 42
43 /** 43 /**
44 * Returns the search destination, if was was given. 44 * Returns the search destination, if was was given.
45 * 45 *
46 * @return optional search destination 46 * @return optional search destination
47 */ 47 */
48 - public V dst(); 48 + V dst();
49 49
50 /** 50 /**
51 * Returns the set of paths produced as a result of the graph search. 51 * Returns the set of paths produced as a result of the graph search.
...@@ -59,14 +59,14 @@ public interface GraphPathSearch<V extends Vertex, E extends Edge<V>> { ...@@ -59,14 +59,14 @@ public interface GraphPathSearch<V extends Vertex, E extends Edge<V>> {
59 * 59 *
60 * @return map of vertex to its parent edge bindings 60 * @return map of vertex to its parent edge bindings
61 */ 61 */
62 - public Map<V, Set<E>> parents(); 62 + Map<V, Set<E>> parents();
63 63
64 /** 64 /**
65 * Return a bindings of each vertex to its cost in the path. 65 * Return a bindings of each vertex to its cost in the path.
66 * 66 *
67 * @return map of vertex to path cost bindings 67 * @return map of vertex to path cost bindings
68 */ 68 */
69 - public Map<V, Double> costs(); 69 + Map<V, Double> costs();
70 } 70 }
71 71
72 /** 72 /**
......
...@@ -26,7 +26,7 @@ public interface GraphSearch<V extends Vertex, E extends Edge<V>> { ...@@ -26,7 +26,7 @@ public interface GraphSearch<V extends Vertex, E extends Edge<V>> {
26 /** 26 /**
27 * Notion of a graph search result. 27 * Notion of a graph search result.
28 */ 28 */
29 - public interface Result<V extends Vertex, E extends Edge<V>> { 29 + interface Result<V extends Vertex, E extends Edge<V>> {
30 } 30 }
31 31
32 /** 32 /**
......
...@@ -26,32 +26,32 @@ public interface IPacket { ...@@ -26,32 +26,32 @@ public interface IPacket {
26 * 26 *
27 * @return the payload 27 * @return the payload
28 */ 28 */
29 - public IPacket getPayload(); 29 + IPacket getPayload();
30 30
31 /** 31 /**
32 * 32 *
33 * @param packet new payload 33 * @param packet new payload
34 * @return self 34 * @return self
35 */ 35 */
36 - public IPacket setPayload(IPacket packet); 36 + IPacket setPayload(IPacket packet);
37 37
38 /** 38 /**
39 * 39 *
40 * @return parent packet 40 * @return parent packet
41 */ 41 */
42 - public IPacket getParent(); 42 + IPacket getParent();
43 43
44 /** 44 /**
45 * 45 *
46 * @param packet new parent 46 * @param packet new parent
47 * @return self 47 * @return self
48 */ 48 */
49 - public IPacket setParent(IPacket packet); 49 + IPacket setParent(IPacket packet);
50 50
51 /** 51 /**
52 * Reset any checksums as needed, and call resetChecksum on all parents. 52 * Reset any checksums as needed, and call resetChecksum on all parents.
53 */ 53 */
54 - public void resetChecksum(); 54 + void resetChecksum();
55 55
56 /** 56 /**
57 * Sets all payloads parent packet if applicable, then serializes this 57 * Sets all payloads parent packet if applicable, then serializes this
...@@ -59,7 +59,7 @@ public interface IPacket { ...@@ -59,7 +59,7 @@ public interface IPacket {
59 * 59 *
60 * @return a byte[] containing this packet and payloads 60 * @return a byte[] containing this packet and payloads
61 */ 61 */
62 - public byte[] serialize(); 62 + byte[] serialize();
63 63
64 /** 64 /**
65 * Deserializes this packet layer and all possible payloads. 65 * Deserializes this packet layer and all possible payloads.
...@@ -71,12 +71,12 @@ public interface IPacket { ...@@ -71,12 +71,12 @@ public interface IPacket {
71 * length of the data to deserialize 71 * length of the data to deserialize
72 * @return the deserialized data 72 * @return the deserialized data
73 */ 73 */
74 - public IPacket deserialize(byte[] data, int offset, int length); 74 + IPacket deserialize(byte[] data, int offset, int length);
75 75
76 /** 76 /**
77 * Clone this packet and its payload packet but not its parent. 77 * Clone this packet and its payload packet but not its parent.
78 * 78 *
79 * @return the clone 79 * @return the clone
80 */ 80 */
81 - public Object clone(); 81 + Object clone();
82 } 82 }
......
...@@ -25,7 +25,7 @@ public interface IExtensionHeader { ...@@ -25,7 +25,7 @@ public interface IExtensionHeader {
25 * 25 *
26 * @return next header 26 * @return next header
27 */ 27 */
28 - public byte getNextHeader(); 28 + byte getNextHeader();
29 29
30 /** 30 /**
31 * Sets the type of next header. 31 * Sets the type of next header.
...@@ -33,5 +33,5 @@ public interface IExtensionHeader { ...@@ -33,5 +33,5 @@ public interface IExtensionHeader {
33 * @param nextHeader the next header to set 33 * @param nextHeader the next header to set
34 * @return this 34 * @return this
35 */ 35 */
36 - public IExtensionHeader setNextHeader(final byte nextHeader); 36 + IExtensionHeader setNextHeader(final byte nextHeader);
37 } 37 }
......