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/api/src/main/java/org/onosproject/incubator/net/l2monitoring/soam/delay/DefaultDelayMeasurementEntry.java b/apps/cfm/api/src/main/java/org/onosproject/incubator/net/l2monitoring/soam/delay/DefaultDelayMeasurementEntry.java
index c53c63b..87f813d 100644
--- a/apps/cfm/api/src/main/java/org/onosproject/incubator/net/l2monitoring/soam/delay/DefaultDelayMeasurementEntry.java
+++ b/apps/cfm/api/src/main/java/org/onosproject/incubator/net/l2monitoring/soam/delay/DefaultDelayMeasurementEntry.java
@@ -19,15 +19,15 @@
import java.util.ArrayList;
import java.util.Collection;
-import org.onosproject.incubator.net.l2monitoring.cfm.Mep.Priority;
import org.onosproject.incubator.net.l2monitoring.cfm.identifier.MepId;
import org.onosproject.incubator.net.l2monitoring.soam.SoamConfigException;
import org.onosproject.incubator.net.l2monitoring.soam.SoamId;
import com.google.common.collect.Lists;
+import org.onosproject.incubator.net.l2monitoring.cfm.Mep;
/**
- * The default implementation of {@link org.onosproject.incubator.net.l2monitoring.soam.delay.DelayMeasurementEntry}.
+ * The default implementation of {@link DelayMeasurementEntry}.
*/
public final class DefaultDelayMeasurementEntry
extends DefaultDelayMeasurementCreate implements DelayMeasurementEntry {
@@ -112,14 +112,14 @@
}
public static DmEntryBuilder builder(SoamId dmId, DmType dmCfgType,
- Version version, MepId remoteMepId, Priority priority)
+ Version version, MepId remoteMepId, Mep.Priority priority)
throws SoamConfigException {
return new DefaultDmEntryBuilder(dmId, dmCfgType, version,
remoteMepId, priority);
}
/**
- * Builder for {@link org.onosproject.incubator.net.l2monitoring.soam.delay.DelayMeasurementEntry}.
+ * Builder for {@link DelayMeasurementEntry}.
*/
private static final class DefaultDmEntryBuilder extends DefaultDmCreateBuilder
implements DmEntryBuilder {
@@ -135,7 +135,7 @@
private Collection<DelayMeasurementStatHistory> historicalResults;
private DefaultDmEntryBuilder(SoamId dmId, DmType dmCfgType,
- Version version, MepId remoteMepId, Priority priority)
+ Version version, MepId remoteMepId, Mep.Priority priority)
throws SoamConfigException {
super(dmCfgType, version, remoteMepId, priority);
if (dmId == null) {