홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
kmcpeake
Committed by Gerrit Code Review
a5404813 1 parent e4621821

[ONOS-3203] Remove final keyword from method arguements 

Removing as requested by Thomas Vachuska so to be consistent with rest of ONOS code.
Note :  ./tools/build/conf/src/main/resources/onos/pmd.xml deliberately excludes MethodArgumentCouldBeFinal from optimizations.xml

Change-Id: Ib1468d5ac39876797b79bd1f6dabd779bfe337bd
Inline Side-by-side
Showing 7 changed files with 31 additions and 33 deletions
...@@ -73,7 +73,7 @@ public class AlarmsManager implements AlarmService { ...@@ -73,7 +73,7 @@ public class AlarmsManager implements AlarmService {
73 private final AtomicLong alarmIdGenerator = new AtomicLong(0); 73 private final AtomicLong alarmIdGenerator = new AtomicLong(0);
74 74
75 @Override 75 @Override
76 - public Alarm update(final Alarm replacement) { 76 + public Alarm update(Alarm replacement) {
77 77
78 final Alarm found = alarms.get(replacement.id()); 78 final Alarm found = alarms.get(replacement.id());
79 if (found == null) { 79 if (found == null) {
...@@ -87,14 +87,14 @@ public class AlarmsManager implements AlarmService { ...@@ -87,14 +87,14 @@ public class AlarmsManager implements AlarmService {
87 } 87 }
88 88
89 @Override 89 @Override
90 - public int getActiveAlarmCount(final DeviceId deviceId) { 90 + public int getActiveAlarmCount(DeviceId deviceId) {
91 //TODO 91 //TODO
92 throw new UnsupportedOperationException(NOT_SUPPORTED_YET); 92 throw new UnsupportedOperationException(NOT_SUPPORTED_YET);
93 } 93 }
94 private static final String NOT_SUPPORTED_YET = "Not supported yet."; 94 private static final String NOT_SUPPORTED_YET = "Not supported yet.";
95 95
96 @Override 96 @Override
97 - public Alarm getAlarm(final AlarmId alarmId) { 97 + public Alarm getAlarm(AlarmId alarmId) {
98 return nullIsNotFound( 98 return nullIsNotFound(
99 alarms.get(alarmId), 99 alarms.get(alarmId),
100 "Alarm is not found"); 100 "Alarm is not found");
...@@ -113,7 +113,7 @@ public class AlarmsManager implements AlarmService { ...@@ -113,7 +113,7 @@ public class AlarmsManager implements AlarmService {
113 113
114 } 114 }
115 115
116 - private static DefaultAlarm generateFake(final DeviceId deviceId, final AlarmId alarmId) { 116 + private static DefaultAlarm generateFake(DeviceId deviceId, AlarmId alarmId) {
117 117
118 return new DefaultAlarm.Builder( 118 return new DefaultAlarm.Builder(
119 alarmId, deviceId, "NE is not reachable", Alarm.SeverityLevel.MAJOR, System.currentTimeMillis()). 119 alarmId, deviceId, "NE is not reachable", Alarm.SeverityLevel.MAJOR, System.currentTimeMillis()).
...@@ -125,36 +125,36 @@ public class AlarmsManager implements AlarmService { ...@@ -125,36 +125,36 @@ public class AlarmsManager implements AlarmService {
125 } 125 }
126 126
127 @Override 127 @Override
128 - public Set<Alarm> getAlarms(final Alarm.SeverityLevel severity) { 128 + public Set<Alarm> getAlarms(Alarm.SeverityLevel severity) {
129 //TODO 129 //TODO
130 throw new UnsupportedOperationException(NOT_SUPPORTED_YET); 130 throw new UnsupportedOperationException(NOT_SUPPORTED_YET);
131 } 131 }
132 132
133 @Override 133 @Override
134 - public Set<Alarm> getAlarms(final DeviceId deviceId) { 134 + public Set<Alarm> getAlarms(DeviceId deviceId) {
135 //TODO 135 //TODO
136 throw new UnsupportedOperationException(NOT_SUPPORTED_YET); 136 throw new UnsupportedOperationException(NOT_SUPPORTED_YET);
137 } 137 }
138 138
139 @Override 139 @Override
140 - public Set<Alarm> getAlarms(final DeviceId deviceId, final AlarmEntityId source) { 140 + public Set<Alarm> getAlarms(DeviceId deviceId, AlarmEntityId source) {
141 //TODO 141 //TODO
142 throw new UnsupportedOperationException(NOT_SUPPORTED_YET); 142 throw new UnsupportedOperationException(NOT_SUPPORTED_YET);
143 } 143 }
144 144
145 @Override 145 @Override
146 - public Set<Alarm> getAlarmsForLink(final ConnectPoint src, final ConnectPoint dst) { 146 + public Set<Alarm> getAlarmsForLink(ConnectPoint src, ConnectPoint dst) {
147 //TODO 147 //TODO
148 throw new UnsupportedOperationException(NOT_SUPPORTED_YET); 148 throw new UnsupportedOperationException(NOT_SUPPORTED_YET);
149 } 149 }
150 150
151 @Override 151 @Override
152 - public Set<Alarm> getAlarmsForFlow(final DeviceId deviceId, final long flowId) { 152 + public Set<Alarm> getAlarmsForFlow(DeviceId deviceId, long flowId) {
153 //TODO 153 //TODO
154 throw new UnsupportedOperationException(NOT_SUPPORTED_YET); 154 throw new UnsupportedOperationException(NOT_SUPPORTED_YET);
155 } 155 }
156 156
157 - private void discoverAlarmsForDevice(final DeviceId deviceId) { 157 + private void discoverAlarmsForDevice(DeviceId deviceId) {
158 final AlarmId alarmId = new AlarmId(alarmIdGenerator.incrementAndGet()); 158 final AlarmId alarmId = new AlarmId(alarmIdGenerator.incrementAndGet());
159 159
160 // TODO In a new thread invoke SNMP Provider with DeviceId and device type and when done update our of alarms 160 // TODO In a new thread invoke SNMP Provider with DeviceId and device type and when done update our of alarms
...@@ -166,14 +166,14 @@ public class AlarmsManager implements AlarmService { ...@@ -166,14 +166,14 @@ public class AlarmsManager implements AlarmService {
166 private class InternalAlarmListener implements AlarmListener { 166 private class InternalAlarmListener implements AlarmListener {
167 167
168 @Override 168 @Override
169 - public void event(final AlarmEvent event) { 169 + public void event(AlarmEvent event) {
170 // TODO 170 // TODO
171 throw new UnsupportedOperationException(NOT_SUPPORTED_YET); 171 throw new UnsupportedOperationException(NOT_SUPPORTED_YET);
172 } 172 }
173 } 173 }
174 174
175 @Activate 175 @Activate
176 - public void activate(final ComponentContext context) { 176 + public void activate(ComponentContext context) {
177 log.info("Activate ..."); 177 log.info("Activate ...");
178 appId = coreService.registerApplication("org.onos.faultmanagement.alarms"); 178 appId = coreService.registerApplication("org.onos.faultmanagement.alarms");
179 idGenerator = coreService.getIdGenerator("alarm-ids"); 179 idGenerator = coreService.getIdGenerator("alarm-ids");
...@@ -185,7 +185,7 @@ public class AlarmsManager implements AlarmService { ...@@ -185,7 +185,7 @@ public class AlarmsManager implements AlarmService {
185 } 185 }
186 186
187 @Deactivate 187 @Deactivate
188 - public void deactivate(final ComponentContext context) { 188 + public void deactivate(ComponentContext context) {
189 log.info("Deactivate ..."); 189 log.info("Deactivate ...");
190 // cfgService.unregisterProperties(getClass(), false); 190 // cfgService.unregisterProperties(getClass(), false);
191 191
...@@ -193,7 +193,7 @@ public class AlarmsManager implements AlarmService { ...@@ -193,7 +193,7 @@ public class AlarmsManager implements AlarmService {
193 } 193 }
194 194
195 @Modified 195 @Modified
196 - public boolean modified(final ComponentContext context) { 196 + public boolean modified(ComponentContext context) {
197 log.info("context={}", context); 197 log.info("context={}", context);
198 if (context == null) { 198 if (context == null) {
199 log.info("No configuration file"); 199 log.info("No configuration file");
...@@ -209,7 +209,7 @@ public class AlarmsManager implements AlarmService { ...@@ -209,7 +209,7 @@ public class AlarmsManager implements AlarmService {
209 return true; 209 return true;
210 } 210 }
211 211
212 - private void discover(final String ipaddresses) { 212 + private void discover(String ipaddresses) {
213 for (String deviceEntry : ipaddresses.split(",")) { 213 for (String deviceEntry : ipaddresses.split(",")) {
214 final DeviceId deviceId = DeviceId.deviceId(deviceEntry); 214 final DeviceId deviceId = DeviceId.deviceId(deviceEntry);
215 if (deviceId != null) { 215 if (deviceId != null) {
......
...@@ -38,7 +38,7 @@ public final class AlarmCodec extends JsonCodec<Alarm> { ...@@ -38,7 +38,7 @@ public final class AlarmCodec extends JsonCodec<Alarm> {
38 private final Logger log = getLogger(getClass()); 38 private final Logger log = getLogger(getClass());
39 39
40 @Override 40 @Override
41 - public ObjectNode encode(final Alarm alarm, final CodecContext context) { 41 + public ObjectNode encode(Alarm alarm, CodecContext context) {
42 checkNotNull(alarm, "Alarm cannot be null"); 42 checkNotNull(alarm, "Alarm cannot be null");
43 43
44 return context.mapper().createObjectNode() 44 return context.mapper().createObjectNode()
...@@ -60,7 +60,7 @@ public final class AlarmCodec extends JsonCodec<Alarm> { ...@@ -60,7 +60,7 @@ public final class AlarmCodec extends JsonCodec<Alarm> {
60 } 60 }
61 61
62 @Override 62 @Override
63 - public Alarm decode(final ObjectNode json, final CodecContext context) { 63 + public Alarm decode(ObjectNode json, CodecContext context) {
64 if (json == null || !json.isObject()) { 64 if (json == null || !json.isObject()) {
65 return null; 65 return null;
66 } 66 }
...@@ -76,8 +76,7 @@ public final class AlarmCodec extends JsonCodec<Alarm> { ...@@ -76,8 +76,7 @@ public final class AlarmCodec extends JsonCodec<Alarm> {
76 final JsonNode jsonTimeCleared = json.get("timeCleared"); 76 final JsonNode jsonTimeCleared = json.get("timeCleared");
77 final Long timeCleared = jsonTimeCleared == null || jsonTimeCleared.isNull() ? null : jsonTimeCleared.asLong(); 77 final Long timeCleared = jsonTimeCleared == null || jsonTimeCleared.isNull() ? null : jsonTimeCleared.asLong();
78 78
79 - final Alarm.SeverityLevel severity 79 + final Alarm.SeverityLevel severity = Alarm.SeverityLevel.valueOf(json.get("severity").asText().toUpperCase());
80 - = Alarm.SeverityLevel.valueOf(json.get("severity").asText().toUpperCase());
81 80
82 final Boolean serviceAffecting = json.get("serviceAffecting").asBoolean(); 81 final Boolean serviceAffecting = json.get("serviceAffecting").asBoolean();
83 final Boolean acknowledged = json.get("acknowledged").asBoolean(); 82 final Boolean acknowledged = json.get("acknowledged").asBoolean();
......
...@@ -59,7 +59,7 @@ public class AlarmsWebResource extends AbstractWebResource { ...@@ -59,7 +59,7 @@ public class AlarmsWebResource extends AbstractWebResource {
59 */ 59 */
60 @GET 60 @GET
61 @Produces(MediaType.APPLICATION_JSON) 61 @Produces(MediaType.APPLICATION_JSON)
62 - public Response getAlarms(@DefaultValue("false") @QueryParam("includeCleared") final boolean includeCleared 62 + public Response getAlarms(@DefaultValue("false") @QueryParam("includeCleared") boolean includeCleared
63 ) { 63 ) {
64 64
65 log.info("Requesting all alarms, includeCleared={}", includeCleared); 65 log.info("Requesting all alarms, includeCleared={}", includeCleared);
...@@ -86,7 +86,7 @@ public class AlarmsWebResource extends AbstractWebResource { ...@@ -86,7 +86,7 @@ public class AlarmsWebResource extends AbstractWebResource {
86 @GET 86 @GET
87 @Path("{id}") 87 @Path("{id}")
88 @Produces(MediaType.APPLICATION_JSON) 88 @Produces(MediaType.APPLICATION_JSON)
89 - public Response getAlarm(@PathParam("id") final String id) { 89 + public Response getAlarm(@PathParam("id") String id) {
90 log.info("HTTP GET alarm for id={}", id); 90 log.info("HTTP GET alarm for id={}", id);
91 91
92 final AlarmId alarmId = toAlarmId(id); 92 final AlarmId alarmId = toAlarmId(id);
...@@ -109,7 +109,7 @@ public class AlarmsWebResource extends AbstractWebResource { ...@@ -109,7 +109,7 @@ public class AlarmsWebResource extends AbstractWebResource {
109 @Path("{alarm_id}") 109 @Path("{alarm_id}")
110 @Consumes(MediaType.APPLICATION_JSON) 110 @Consumes(MediaType.APPLICATION_JSON)
111 @Produces(MediaType.APPLICATION_JSON) 111 @Produces(MediaType.APPLICATION_JSON)
112 - public Response update(@PathParam("alarm_id") final String alarmIdPath, final InputStream stream) { 112 + public Response update(@PathParam("alarm_id") String alarmIdPath, InputStream stream) {
113 log.info("PUT NEW ALARM at /{}", alarmIdPath); 113 log.info("PUT NEW ALARM at /{}", alarmIdPath);
114 114
115 try { 115 try {
...@@ -134,7 +134,7 @@ public class AlarmsWebResource extends AbstractWebResource { ...@@ -134,7 +134,7 @@ public class AlarmsWebResource extends AbstractWebResource {
134 } 134 }
135 } 135 }
136 136
137 - private static AlarmId toAlarmId(final String id) { 137 + private static AlarmId toAlarmId(String id) {
138 try { 138 try {
139 return AlarmId.valueOf(Long.parseLong(id)); 139 return AlarmId.valueOf(Long.parseLong(id));
140 } catch (NumberFormatException ex) { 140 } catch (NumberFormatException ex) {
......
...@@ -107,7 +107,7 @@ public class AlarmCodecTest { ...@@ -107,7 +107,7 @@ public class AlarmCodecTest {
107 107
108 } 108 }
109 109
110 - private void assertCommon(final Alarm alarm) { 110 + private void assertCommon(Alarm alarm) {
111 assertThat(alarm.id(), is(new AlarmId(10L))); 111 assertThat(alarm.id(), is(new AlarmId(10L)));
112 assertThat(alarm.description(), is("NE is not reachable")); 112 assertThat(alarm.description(), is("NE is not reachable"));
113 assertThat(alarm.source(), is(AlarmEntityId.NONE)); 113 assertThat(alarm.source(), is(AlarmEntityId.NONE));
...@@ -124,9 +124,9 @@ public class AlarmCodecTest { ...@@ -124,9 +124,9 @@ public class AlarmCodecTest {
124 * 124 *
125 * @param resourceName resource to use to read the JSON for the rule 125 * @param resourceName resource to use to read the JSON for the rule
126 * @return decoded flow rule 126 * @return decoded flow rule
127 - * @throws IOException if processing the resource failsdecode 127 + * @throws IOException if processing the resource fails to decode
128 */ 128 */
129 - private Alarm getDecodedAlarm(final JsonCodec<Alarm> codec, final String resourceName) throws IOException { 129 + private Alarm getDecodedAlarm(JsonCodec<Alarm> codec, String resourceName) throws IOException {
130 final InputStream jsonStream = AlarmCodecTest.class 130 final InputStream jsonStream = AlarmCodecTest.class
131 .getResourceAsStream(resourceName); 131 .getResourceAsStream(resourceName);
132 final JsonNode json = context.mapper().readTree(jsonStream); 132 final JsonNode json = context.mapper().readTree(jsonStream);
......
...@@ -28,12 +28,12 @@ public final class AlarmJsonMatcher extends TypeSafeDiagnosingMatcher<JsonNode> ...@@ -28,12 +28,12 @@ public final class AlarmJsonMatcher extends TypeSafeDiagnosingMatcher<JsonNode>
28 28
29 private final Alarm alarm; 29 private final Alarm alarm;
30 30
31 - private AlarmJsonMatcher(final Alarm alarm) { 31 + private AlarmJsonMatcher(Alarm alarm) {
32 this.alarm = alarm; 32 this.alarm = alarm;
33 } 33 }
34 34
35 @Override 35 @Override
36 - public boolean matchesSafely(final JsonNode jsonAlarm, final Description description) { 36 + public boolean matchesSafely(JsonNode jsonAlarm, Description description) {
37 final String jsonAlarmId = jsonAlarm.get("id").asText(); 37 final String jsonAlarmId = jsonAlarm.get("id").asText();
38 final String alarmId = Long.toString(alarm.id().fingerprint()); 38 final String alarmId = Long.toString(alarm.id().fingerprint());
39 if (!jsonAlarmId.equals(alarmId)) { 39 if (!jsonAlarmId.equals(alarmId)) {
...@@ -119,7 +119,7 @@ public final class AlarmJsonMatcher extends TypeSafeDiagnosingMatcher<JsonNode> ...@@ -119,7 +119,7 @@ public final class AlarmJsonMatcher extends TypeSafeDiagnosingMatcher<JsonNode>
119 } 119 }
120 120
121 @Override 121 @Override
122 - public void describeTo(final Description description) { 122 + public void describeTo(Description description) {
123 description.appendText(alarm.toString()); 123 description.appendText(alarm.toString());
124 } 124 }
125 125
...@@ -129,7 +129,7 @@ public final class AlarmJsonMatcher extends TypeSafeDiagnosingMatcher<JsonNode> ...@@ -129,7 +129,7 @@ public final class AlarmJsonMatcher extends TypeSafeDiagnosingMatcher<JsonNode>
129 * @param alarm alarm object we are looking for 129 * @param alarm alarm object we are looking for
130 * @return matcher 130 * @return matcher
131 */ 131 */
132 - public static AlarmJsonMatcher matchesAlarm(final Alarm alarm) { 132 + public static AlarmJsonMatcher matchesAlarm(Alarm alarm) {
133 return new AlarmJsonMatcher(alarm); 133 return new AlarmJsonMatcher(alarm);
134 } 134 }
135 } 135 }
......
...@@ -41,8 +41,7 @@ public class AlarmsWebResourceTest extends ResourceTest { ...@@ -41,8 +41,7 @@ public class AlarmsWebResourceTest extends ResourceTest {
41 final CodecManager codecService = new CodecManager(); 41 final CodecManager codecService = new CodecManager();
42 codecService.activate(); 42 codecService.activate();
43 43
44 - final ServiceDirectory testDirectory 44 + final ServiceDirectory testDirectory = new TestServiceDirectory()
45 - = new TestServiceDirectory()
46 // Currently no alarms-service implemented 45 // Currently no alarms-service implemented
47 // .add(AlarmsService.class, alarmsService) 46 // .add(AlarmsService.class, alarmsService)
48 .add(CodecService.class, codecService); 47 .add(CodecService.class, codecService);
......
...@@ -43,7 +43,7 @@ public class SNMPAlarmProvider extends AbstractProvider implements AlarmProvider ...@@ -43,7 +43,7 @@ public class SNMPAlarmProvider extends AbstractProvider implements AlarmProvider
43 } 43 }
44 44
45 @Override 45 @Override
46 - public void triggerProbe(final DeviceId deviceId) { 46 + public void triggerProbe(DeviceId deviceId) {
47 47
48 // TODO in shout term should this just be synchronous and return result? 48 // TODO in shout term should this just be synchronous and return result?
49 LOG.info("Run a SNMP discovery for device at {} when done invoke on AlarmProviderService", deviceId); 49 LOG.info("Run a SNMP discovery for device at {} when done invoke on AlarmProviderService", deviceId);
......