diff --git a/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/Controller.java b/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/Controller.java index 578dae028d..324e06d567 100644 --- a/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/Controller.java +++ b/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/Controller.java @@ -38,8 +38,6 @@ import org.onosproject.openflow.controller.Dpid; import org.onosproject.openflow.controller.driver.OpenFlowAgent; import org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver; import org.projectfloodlight.openflow.protocol.OFDescStatsReply; -import org.projectfloodlight.openflow.protocol.OFFactories; -import org.projectfloodlight.openflow.protocol.OFFactory; import org.projectfloodlight.openflow.protocol.OFVersion; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -77,17 +75,6 @@ public class Controller { private static final Logger log = LoggerFactory.getLogger(Controller.class); - /** - * @deprecated in 1.10.0 - */ - @Deprecated - protected static final OFFactory FACTORY13 = OFFactories.getFactory(OFVersion.OF_13); - /** - * @deprecated in 1.10.0 - */ - @Deprecated - protected static final OFFactory FACTORY10 = OFFactories.getFactory(OFVersion.OF_10); - private static final boolean TLS_DISABLED = false; private static final short MIN_KS_LENGTH = 6; @@ -119,29 +106,6 @@ public class Controller { private DriverService driverService; private boolean enableOfTls = TLS_DISABLED; - // *************** - // Getters/Setters - // *************** - - /** - * @return OF1.0 factory - * @deprecated in 1.10.0 - */ - @Deprecated - public OFFactory getOFMessageFactory10() { - return FACTORY10; - } - - - /** - * @return OF1.3 factory - * @deprecated in 1.10.0 - */ - @Deprecated - public OFFactory getOFMessageFactory13() { - return FACTORY13; - } - // ************** // Initialization // **************