Refactor of CFM code part 5 - SonarQube recommended code changes
previously:
Refactor of CFM code part 4 - Microsemi driver - updating modules.deps with the move of the driver code
Refactor of CFM code part 3 - Microsemi driver: moved everything out of drivers/microsemi to /drivers/microsemi/ea1000 to make room for future drivers
Refactor of CFM code parti 2 - API: moved everything from incubator/*/src/main/java/org/onosproject/incubator/net/l2monitoring to apps/cfm/*/src/main/java/org/onosproject/incubator/net/l2monitoring - this means that services belonging to l2 monitoring will now only be loaded when cfm app is started
Refactor of CFM code part 1 - NBI: moves the CLI and REST part of the app down a level to an nbi folder for a more consistent approach with other modules
Change-Id: I39b302fd8620f59d34ab41208cbc28765951aad4
diff --git a/apps/cfm/app/src/main/java/org/onosproject/incubator/net/l2monitoring/cfm/impl/DistributedMdStore.java b/apps/cfm/app/src/main/java/org/onosproject/incubator/net/l2monitoring/cfm/impl/DistributedMdStore.java
index 82c550d..81813f8 100644
--- a/apps/cfm/app/src/main/java/org/onosproject/incubator/net/l2monitoring/cfm/impl/DistributedMdStore.java
+++ b/apps/cfm/app/src/main/java/org/onosproject/incubator/net/l2monitoring/cfm/impl/DistributedMdStore.java
@@ -108,12 +108,9 @@
.register(InternetDomainName.class)
.register(MacAddress.class)
.register(ImmutablePair.class)
- .register(org.onosproject.incubator.net.l2monitoring
- .cfm.Component.MhfCreationType.class)
- .register(org.onosproject.incubator.net.l2monitoring
- .cfm.Component.IdPermissionType.class)
- .register(org.onosproject.incubator.net.l2monitoring
- .cfm.Component.TagType.class)
+ .register(org.onosproject.incubator.net.l2monitoring.cfm.Component.MhfCreationType.class)
+ .register(org.onosproject.incubator.net.l2monitoring.cfm.Component.IdPermissionType.class)
+ .register(org.onosproject.incubator.net.l2monitoring.cfm.Component.TagType.class)
.build("md")))
.build();
mapListener = new InternalMdListener();
diff --git a/apps/cfm/app/src/main/java/org/onosproject/incubator/net/l2monitoring/soam/impl/SoamManager.java b/apps/cfm/app/src/main/java/org/onosproject/incubator/net/l2monitoring/soam/impl/SoamManager.java
index ca8a373..79a6480 100644
--- a/apps/cfm/app/src/main/java/org/onosproject/incubator/net/l2monitoring/soam/impl/SoamManager.java
+++ b/apps/cfm/app/src/main/java/org/onosproject/incubator/net/l2monitoring/soam/impl/SoamManager.java
@@ -230,7 +230,7 @@
@Override
public LossMeasurementStatCurrent getLmCurrentStat(MdId mdName,
- MaIdShort maName, MepId mepId, SoamId lmId) {
+ MaIdShort maName, MepId mepId, SoamId lmId) {
throw new UnsupportedOperationException("Not yet implemented");
}
diff --git a/apps/cfm/app/src/main/java/org/onosproject/incubator/net/l2monitoring/soam/impl/package-info.java b/apps/cfm/app/src/main/java/org/onosproject/incubator/net/l2monitoring/soam/impl/package-info.java
index fd932e0..a0d89e8 100644
--- a/apps/cfm/app/src/main/java/org/onosproject/incubator/net/l2monitoring/soam/impl/package-info.java
+++ b/apps/cfm/app/src/main/java/org/onosproject/incubator/net/l2monitoring/soam/impl/package-info.java
@@ -17,4 +17,4 @@
/**
* An implementation of Layer 2 CFM Service Operations and Maintenance (SOAM).
*/
-package org.onosproject.incubator.net.l2monitoring.soam.impl;
\ No newline at end of file
+package org.onosproject.incubator.net.l2monitoring.impl;
\ No newline at end of file
diff --git a/apps/cfm/app/src/test/java/org/onosproject/incubator/net/l2monitoring/soam/impl/TestSoamDmProgrammable.java b/apps/cfm/app/src/test/java/org/onosproject/incubator/net/l2monitoring/soam/impl/TestSoamDmProgrammable.java
index 9750550..c084a7a 100644
--- a/apps/cfm/app/src/test/java/org/onosproject/incubator/net/l2monitoring/soam/impl/TestSoamDmProgrammable.java
+++ b/apps/cfm/app/src/test/java/org/onosproject/incubator/net/l2monitoring/soam/impl/TestSoamDmProgrammable.java
@@ -42,8 +42,6 @@
import java.util.Collection;
import java.util.Optional;
-import static org.onosproject.incubator.net.l2monitoring.soam.impl.SoamManagerTest.*;
-
/**
* A dummy implementation of the SoamDmProgrammable for test purposes.
*/
@@ -80,7 +78,7 @@
.build();
dmEntry1 = DefaultDelayMeasurementEntry
- .builder(DMID101, DelayMeasurementCreate.DmType.DM1DMTX,
+ .builder(SoamManagerTest.DMID101, DelayMeasurementCreate.DmType.DM1DMTX,
DelayMeasurementCreate.Version.Y17312011,
MepId.valueOf((short) 11), Mep.Priority.PRIO5)
.currentResult(current)
@@ -94,7 +92,8 @@
MdId mdName, MaIdShort maName, MepId mepId)
throws CfmConfigException, SoamConfigException {
Collection<DelayMeasurementEntry> dmEntries = new ArrayList<>();
- if (mdName.equals(MDNAME1) && maName.equals(MANAME1) && mepId.equals(MEPID1)) {
+ if (mdName.equals(SoamManagerTest.MDNAME1) && maName.equals(SoamManagerTest.MANAME1)
+ && mepId.equals(SoamManagerTest.MEPID1)) {
dmEntries.add(dmEntry1);
return dmEntries;
}
@@ -105,7 +104,8 @@
public DelayMeasurementEntry getDm(
MdId mdName, MaIdShort maName, MepId mepId, SoamId dmId)
throws CfmConfigException, SoamConfigException {
- if (mdName.equals(MDNAME1) && maName.equals(MANAME1) && mepId.equals(MEPID1)) {
+ if (mdName.equals(SoamManagerTest.MDNAME1) && maName.equals(SoamManagerTest.MANAME1)
+ && mepId.equals(SoamManagerTest.MEPID1)) {
return dmEntry1;
}
return null;
@@ -115,7 +115,8 @@
public DelayMeasurementStatCurrent getDmCurrentStat(
MdId mdName, MaIdShort maName, MepId mepId, SoamId dmId)
throws CfmConfigException, SoamConfigException {
- if (mdName.equals(MDNAME1) && maName.equals(MANAME1) && mepId.equals(MEPID1)) {
+ if (mdName.equals(SoamManagerTest.MDNAME1) && maName.equals(SoamManagerTest.MANAME1)
+ && mepId.equals(SoamManagerTest.MEPID1)) {
return dmEntry1.currentResult();
}
return null;
@@ -125,7 +126,8 @@
public Collection<DelayMeasurementStatHistory> getDmHistoricalStats(
MdId mdName, MaIdShort maName, MepId mepId, SoamId dmId)
throws CfmConfigException, SoamConfigException {
- if (mdName.equals(MDNAME1) && maName.equals(MANAME1) && mepId.equals(MEPID1)) {
+ if (mdName.equals(SoamManagerTest.MDNAME1) && maName.equals(SoamManagerTest.MANAME1)
+ && mepId.equals(SoamManagerTest.MEPID1)) {
return dmEntry1.historicalResults();
}
return null;