Removing commented out @Property annotations from the drivers, protocols, pipelines and providers.
Change-Id: I4cabc5a53c93b778824c72cebbce0ec49700eade
diff --git a/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java b/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java
index 6117339..f849467 100644
--- a/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java
+++ b/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java
@@ -453,12 +453,10 @@
private final InternalDeviceProvider listener = new InternalDeviceProvider();
- //@Property(name = POLL_PROP_NAME, intValue = POLL_INTERVAL,
- //label = "Frequency (in seconds) for polling switch Port statistics")
+ /** Frequency (in seconds) for polling switch Port statistics. */
private int portStatsPollFrequency = POLL_FREQ_DEFAULT;
- //@Property(name = PROP_FREQ, boolValue = DEFAULT_PROP_FREQ,
- //label = "It indicates frequency must be used instead of wavelength for port tuning.")
+ /** It indicates frequency must be used instead of wavelength for port tuning. */
private static boolean propFreq = PROP_FREQ_DEFAULT;
private final Timer timer = new Timer("onos-openflow-portstats-collector");
diff --git a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/OpenFlowRuleProvider.java b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/OpenFlowRuleProvider.java
index 22b5246..d1867e2 100644
--- a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/OpenFlowRuleProvider.java
+++ b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/OpenFlowRuleProvider.java
@@ -135,12 +135,10 @@
private static final int MIN_EXPECTED_BYTE_LEN = 56;
private static final int SKIP_BYTES = 4;
- //@Property(name = "flowPollFrequency", intValue = DEFAULT_POLL_FREQUENCY,
- // label = "Frequency (in seconds) for polling flow statistics")
+ /** Frequency (in seconds) for polling flow statistics. */
private int flowPollFrequency = POLL_FREQUENCY_DEFAULT;
- //@Property(name = "adaptiveFlowSampling", boolValue = DEFAULT_ADAPTIVE_FLOW_SAMPLING,
- // label = "Adaptive Flow Sampling is on or off")
+ /** Adaptive Flow Sampling is on or off. */
private boolean adaptiveFlowSampling = ADAPTIVE_FLOW_SAMPLING_DEFAULT;
private FlowRuleProviderService providerService;
diff --git a/providers/openflow/group/src/main/java/org/onosproject/provider/of/group/impl/OpenFlowGroupProvider.java b/providers/openflow/group/src/main/java/org/onosproject/provider/of/group/impl/OpenFlowGroupProvider.java
index a74e2c7..433cfb6 100644
--- a/providers/openflow/group/src/main/java/org/onosproject/provider/of/group/impl/OpenFlowGroupProvider.java
+++ b/providers/openflow/group/src/main/java/org/onosproject/provider/of/group/impl/OpenFlowGroupProvider.java
@@ -121,8 +121,7 @@
private static final String COMPONENT = "org.onosproject.provider.of.group.impl.OpenFlowGroupProvider";
- //@Property(name = "groupPollInterval", intValue = DEFAULT_POLL_INTERVAL,
- // label = "Frequency (in seconds) for polling group statistics")
+ /** Frequency (in seconds) for polling group statistics. */
private int groupPollInterval = POLL_FREQUENCY_DEFAULT;
private final InternalGroupProvider listener = new InternalGroupProvider();