Refactor: Rename the class and method to make them more descriptive
- Rename from FlowModBuilderHelper to OpenFlowValueMapper
- Rename from UnsupportedConversionException to NoMappingFoundException
- For methods, use "lookup" instead of "convert"
Change-Id: I8e86e3221385a48524247aa78a497b524e16071a
diff --git a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer13.java b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer13.java
index 413fbd0..4103b02 100644
--- a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer13.java
+++ b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer13.java
@@ -71,9 +71,6 @@
import java.util.List;
import java.util.Optional;
-import static org.onosproject.provider.of.flow.impl.FlowModBuilderHelper.convertChannelSpacing;
-import static org.onosproject.provider.of.flow.impl.FlowModBuilderHelper.convertGridType;
-
/**
* Flow mod builder for OpenFlow 1.3+.
*/
@@ -267,7 +264,7 @@
case OCH:
try {
return buildModOchSignalInstruction((ModOchSignalInstruction) i);
- } catch (UnsupportedConversionException e) {
+ } catch (NoMappingFoundException e) {
log.warn(e.getMessage());
break;
}
@@ -285,8 +282,8 @@
private OFAction buildModOchSignalInstruction(ModOchSignalInstruction instruction) {
OchSignal signal = instruction.lambda();
- byte gridType = convertGridType(signal.gridType());
- byte channelSpacing = convertChannelSpacing(signal.channelSpacing());
+ byte gridType = OpenFlowValueMapper.lookupGridType(signal.gridType());
+ byte channelSpacing = OpenFlowValueMapper.lookupChannelSpacing(signal.channelSpacing());
return factory().actions().circuit(factory().oxms().ochSigidBasic(
new CircuitSignalID(gridType, channelSpacing,