Fix checkstyle impl/common and impl/configuration 68/62068/1
authorJozef Bacigal <jozef.bacigal@pantheon.tech>
Mon, 21 Aug 2017 08:57:46 +0000 (10:57 +0200)
committerJozef Bacigal <jozef.bacigal@pantheon.tech>
Mon, 21 Aug 2017 08:57:46 +0000 (10:57 +0200)
Change-Id: I88b6af868552053cbaa3e01cec19df09db472979
Signed-off-by: Jozef Bacigal <jozef.bacigal@pantheon.tech>
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/common/ItemLifeCycleSourceImpl.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/common/MultipartReplyTranslatorUtil.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/common/MultipartRequestInputFactory.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/configuration/ConfigurationServiceFactoryImpl.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/configuration/OpenFlowProviderConfigImpl.java
openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/OpendaylightFlowTableStatisticsServiceImpl.java

index caaf4f986740bb0e4dbb5ec9740e0fb730b941fe..d6572083a8347855cf533406dbc7e6cf801c6728 100644 (file)
@@ -14,7 +14,7 @@ import org.opendaylight.openflowplugin.api.openflow.rpc.ItemLifeCycleSource;
 import org.opendaylight.openflowplugin.api.openflow.rpc.listener.ItemLifecycleListener;
 
 /**
- * simple standalone {@link ItemLifeCycleSource} implementation
+ * simple standalone {@link ItemLifeCycleSource} implementation.
  */
 public class ItemLifeCycleSourceImpl implements ItemLifeCycleKeeper {
 
index 43eeceb38d464e3b2767bc6e922909b75c0c8460..d046883da9590258866bff23315c6c6d90a7140c 100644 (file)
@@ -125,15 +125,17 @@ import org.slf4j.LoggerFactory;
 
 /**
  * Class converts multipart reply messages to the objects that can be then written to datastore using
- * multipart writers
+ * multipart writers.
  */
 public class MultipartReplyTranslatorUtil {
     private static final Logger LOG = LoggerFactory.getLogger(MultipartReplyTranslatorUtil.class);
 
-    public static Optional<? extends MultipartReplyBody> translate(final OfHeader message,
-                                                                   final DeviceInfo deviceInfo,
-                                                                   @Nullable final ConvertorExecutor convertorExecutor,
-                                                                   @Nullable final TranslatorLibrary translatorLibrary) {
+    public static Optional<? extends MultipartReplyBody> translate(
+            final OfHeader message,
+            final DeviceInfo deviceInfo,
+            @Nullable final ConvertorExecutor convertorExecutor,
+            @Nullable final TranslatorLibrary translatorLibrary) {
+
         if (message instanceof MultipartReply) {
             final Optional<ConvertorExecutor> convertor = Optional.ofNullable(convertorExecutor);
             final Optional<TranslatorLibrary> translator = Optional.ofNullable(translatorLibrary);
@@ -171,6 +173,7 @@ public class MultipartReplyTranslatorUtil {
                     return convertor.flatMap(c -> Optional.of(translateTableFeatures(msg, deviceInfo.getVersion(), c)));
                 case OFPMPPORTDESC:
                     return translator.flatMap(t -> Optional.of(translatePortDesc(msg, deviceInfo, t)));
+                default:
             }
         } else if (message instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.multipart.types.rev170112
             .MultipartReply) {
@@ -206,10 +209,11 @@ public class MultipartReplyTranslatorUtil {
             .build();
     }
 
-    private static org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.multipart.reply.multipart.reply.body
-        .MultipartReplyTableFeatures translateTableFeatures(final MultipartReply msg,
-                                                            final short version,
-                                                            final ConvertorExecutor convertorExecutor) {
+    private static org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.multipart.reply.multipart
+            .reply.body.MultipartReplyTableFeatures translateTableFeatures(
+                    final MultipartReply msg,
+                    final short version,
+                    final ConvertorExecutor convertorExecutor) {
         MultipartReplyTableFeaturesCase caseBody = (MultipartReplyTableFeaturesCase) msg.getMultipartReplyBody();
         final MultipartReplyTableFeatures multipartReplyTableFeatures = caseBody.getMultipartReplyTableFeatures();
         final Optional<List<org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.features
@@ -221,8 +225,8 @@ public class MultipartReplyTranslatorUtil {
             .build();
     }
 
-    private static org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.multipart.reply.multipart.reply.body
-        .MultipartReplyDesc translateDesc(final MultipartReply msg) {
+    private static org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.multipart.reply.multipart
+            .reply.body.MultipartReplyDesc translateDesc(final MultipartReply msg) {
         final MultipartReplyDesc desc = ((MultipartReplyDescCase) msg.getMultipartReplyBody()).getMultipartReplyDesc();
 
         return new MultipartReplyDescBuilder()
@@ -260,10 +264,11 @@ public class MultipartReplyTranslatorUtil {
         return message.build();
     }
 
-    private static org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.multipart.reply.multipart.reply.body
-        .MultipartReplyPortStats translatePortStats(final MultipartReply msg,
-                                                    final OpenflowVersion ofVersion,
-                                                    final BigInteger datapathId) {
+    private static org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.multipart.reply.multipart
+            .reply.body.MultipartReplyPortStats translatePortStats(
+                    final MultipartReply msg,
+                    final OpenflowVersion ofVersion,
+                    final BigInteger datapathId) {
         MultipartReplyPortStatsBuilder message = new MultipartReplyPortStatsBuilder();
         MultipartReplyPortStatsCase caseBody = (MultipartReplyPortStatsCase) msg.getMultipartReplyBody();
         MultipartReplyPortStats replyBody = caseBody.getMultipartReplyPortStats();
@@ -328,10 +333,11 @@ public class MultipartReplyTranslatorUtil {
         return message.build();
     }
 
-    private static org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.multipart.reply.multipart.reply.body
-        .MultipartReplyGroupDesc translateGroupDesc(final MultipartReply msg,
-                                                    final VersionDatapathIdConvertorData data,
-                                                    final ConvertorExecutor convertorExecutor) {
+    private static org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.multipart.reply.multipart
+            .reply.body.MultipartReplyGroupDesc translateGroupDesc(
+                    final MultipartReply msg,
+                    final VersionDatapathIdConvertorData data,
+                    final ConvertorExecutor convertorExecutor) {
         MultipartReplyGroupDescBuilder message = new MultipartReplyGroupDescBuilder();
         MultipartReplyGroupDescCase caseBody = (MultipartReplyGroupDescCase) msg.getMultipartReplyBody();
         MultipartReplyGroupDesc replyBody = caseBody.getMultipartReplyGroupDesc();
@@ -344,11 +350,11 @@ public class MultipartReplyTranslatorUtil {
         return message.build();
     }
 
-    private static org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.multipart.reply.multipart.reply.body
-        .MultipartReplyGroupFeatures translateGroupFeatures(final MultipartReply msg) {
-        MultipartReplyGroupFeaturesBuilder message = new MultipartReplyGroupFeaturesBuilder();
-        MultipartReplyGroupFeaturesCase caseBody = (MultipartReplyGroupFeaturesCase) msg.getMultipartReplyBody();
-        MultipartReplyGroupFeatures replyBody = caseBody.getMultipartReplyGroupFeatures();
+    private static org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.multipart.reply.multipart
+            .reply.body.MultipartReplyGroupFeatures translateGroupFeatures(final MultipartReply msg) {
+        final MultipartReplyGroupFeaturesBuilder message = new MultipartReplyGroupFeaturesBuilder();
+        final MultipartReplyGroupFeaturesCase caseBody = (MultipartReplyGroupFeaturesCase) msg.getMultipartReplyBody();
+        final MultipartReplyGroupFeatures replyBody = caseBody.getMultipartReplyGroupFeatures();
         List<Class<? extends GroupType>> supportedGroups =
             new ArrayList<>();
 
@@ -395,30 +401,34 @@ public class MultipartReplyTranslatorUtil {
         MultipartReplyMeterStatsBuilder message = new MultipartReplyMeterStatsBuilder();
         MultipartReplyMeterCase caseBody = (MultipartReplyMeterCase) msg.getMultipartReplyBody();
         MultipartReplyMeter replyBody = caseBody.getMultipartReplyMeter();
-        final Optional<List<org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.statistics.reply.MeterStats>> meterStatsList =
-            convertorExecutor.convert(replyBody.getMeterStats(), data);
+        final Optional<List<
+                org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.statistics.reply.MeterStats
+                >>
+                meterStatsList = convertorExecutor.convert(replyBody.getMeterStats(), data);
 
         message.setMeterStats(meterStatsList.orElse(Collections.emptyList()));
 
         return message.build();
     }
 
-    private static org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.multipart.reply.multipart.reply.body
-        .MultipartReplyMeterConfig translateMeterConfig(final MultipartReply msg,
-                                                        final VersionDatapathIdConvertorData data,
-                                                        final ConvertorExecutor convertorExecutor) {
+    private static org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.multipart.reply.multipart
+            .reply.body.MultipartReplyMeterConfig translateMeterConfig(
+                    final MultipartReply msg,
+                    final VersionDatapathIdConvertorData data,
+                    final ConvertorExecutor convertorExecutor) {
         MultipartReplyMeterConfigBuilder message = new MultipartReplyMeterConfigBuilder();
         MultipartReplyMeterConfigCase caseBody = (MultipartReplyMeterConfigCase) msg.getMultipartReplyBody();
         MultipartReplyMeterConfig replyBody = caseBody.getMultipartReplyMeterConfig();
-        final Optional<List<MeterConfigStats>> meterConfigStatsList = convertorExecutor.convert(replyBody.getMeterConfig(), data);
+        final Optional<List<MeterConfigStats>> meterConfigStatsList
+                = convertorExecutor.convert(replyBody.getMeterConfig(), data);
 
         message.setMeterConfigStats(meterConfigStatsList.orElse(Collections.emptyList()));
 
         return message.build();
     }
 
-    private static org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.multipart.reply.multipart.reply.body
-        .MultipartReplyMeterFeatures translateMeterFeatures(final MultipartReply msg) {
+    private static org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.multipart.reply.multipart
+            .reply.body.MultipartReplyMeterFeatures translateMeterFeatures(final MultipartReply msg) {
         MultipartReplyMeterFeaturesBuilder message = new MultipartReplyMeterFeaturesBuilder();
         MultipartReplyMeterFeaturesCase caseBody = (MultipartReplyMeterFeaturesCase) msg.getMultipartReplyBody();
         MultipartReplyMeterFeatures replyBody = caseBody.getMultipartReplyMeterFeatures();
@@ -463,7 +473,8 @@ public class MultipartReplyTranslatorUtil {
         MultipartReplyTable replyBody = caseBody.getMultipartReplyTable();
         List<TableStats> swTablesStats = replyBody.getTableStats();
 
-        List<FlowTableAndStatisticsMap> salFlowStats = new ArrayList<FlowTableAndStatisticsMap>();
+        List<FlowTableAndStatisticsMap> salFlowStats = new ArrayList<>();
+        //TODO: Duplicate code: look at OpendaylightFlowTableStatisticsServiceImpl method transformToNotification
         for (TableStats swTableStats : swTablesStats) {
             FlowTableAndStatisticsMapBuilder statisticsBuilder = new FlowTableAndStatisticsMapBuilder();
 
index 43ad95b790ecbc3597f42eb4c1132133fbb03f89..910a3ad07c66d90b921edd4394c395d0ad5c6f4d 100644 (file)
@@ -61,15 +61,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216.
 /**
  * openflowplugin-impl
  * org.opendaylight.openflowplugin.impl.common
- * <p>
  * Factory class is designed for easy producing a MultipartRequestInput. Class should help
  * to understand a relationship between {@link MultipartType} and {@link MultipartRequestInput}
  * without touch OF specification 1.3.2  - a section 7.3.5. Multipart Messages
- * see also <a href="https://www.opennetworking.org/images/stories/downloads/sdn-resources/onf-specifications/openflow/openflow-spec-v1.3.2.pdf">OpenFlow 1.3.2</a>
- *
- * @author <a href="mailto:vdemcak@cisco.com">Vaclav Demcak</a>
- *         <p>
- *         Created: Mar 27, 2015
  */
 public final class MultipartRequestInputFactory {
 
@@ -78,7 +72,8 @@ public final class MultipartRequestInputFactory {
     }
 
     /**
-     * Method validate input and makes {@link org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader}
+     * Method validate input and makes
+     * {@link org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader}
      * from input values. Method set a moreRequest marker to false and it creates default empty multipart request body
      * by {@link MultipartType}
      *
@@ -92,20 +87,20 @@ public final class MultipartRequestInputFactory {
                                                 final short version,
                                                 @Nonnull final MultipartType type,
                                                 final boolean canUseSingleLayer) {
-        return canUseSingleLayer ?
-            new MultipartRequestBuilder()
-                .setRequestMore(false)
-                .setVersion(version)
-                .setXid(xid)
-                .setMultipartRequestBody(makeDefaultSingleLayerBody(type))
-                .build() :
-            new MultipartRequestInputBuilder()
-                .setFlags(new MultipartRequestFlags(false))
-                .setMultipartRequestBody(makeDefaultMultiLayerBody(type, version))
-                .setVersion(version)
-                .setType(type)
-                .setXid(xid)
-                .build();
+        return canUseSingleLayer
+                ? new MultipartRequestBuilder()
+                    .setRequestMore(false)
+                    .setVersion(version)
+                    .setXid(xid)
+                    .setMultipartRequestBody(makeDefaultSingleLayerBody(type))
+                    .build()
+                : new MultipartRequestInputBuilder()
+                    .setFlags(new MultipartRequestFlags(false))
+                    .setMultipartRequestBody(makeDefaultMultiLayerBody(type, version))
+                    .setVersion(version)
+                    .setType(type)
+                    .setXid(xid)
+                    .build();
     }
 
     private static org.opendaylight.yang.gen.v1.urn.opendaylight.multipart.types.rev170112.multipart.request
@@ -118,18 +113,18 @@ public final class MultipartRequestInputFactory {
                 .build();
             case OFPMPAGGREGATE: return new MultipartRequestFlowAggregateStatsBuilder().build();
             case OFPMPTABLE: return new MultipartRequestFlowTableStatsBuilder().build();
-            case OFPMPPORTSTATS: return new org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.multipart.request.multipart.request.body
-                .MultipartRequestPortStatsBuilder().build();
+            case OFPMPPORTSTATS: return new org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics
+                    .rev131214.multipart.request.multipart.request.body.MultipartRequestPortStatsBuilder().build();
             case OFPMPQUEUE: return new MultipartRequestQueueStatsBuilder().build();
             case OFPMPGROUP: return new MultipartRequestGroupStatsBuilder().build();
             case OFPMPGROUPDESC: return new MultipartRequestGroupDescBuilder().build();
             case OFPMPGROUPFEATURES: return new MultipartRequestGroupFeaturesBuilder().build();
             case OFPMPMETER: return new MultipartRequestMeterStatsBuilder().build();
-            case OFPMPMETERCONFIG: return new org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.multipart.request.multipart.request.body
-                .MultipartRequestMeterConfigBuilder().build();
+            case OFPMPMETERCONFIG: return new org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics
+                    .rev131111.multipart.request.multipart.request.body.MultipartRequestMeterConfigBuilder().build();
             case OFPMPMETERFEATURES: return new MultipartRequestMeterFeaturesBuilder().build();
-            case OFPMPTABLEFEATURES: return new org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.multipart.request.multipart.request.body
-                .MultipartRequestTableFeaturesBuilder().build();
+            case OFPMPTABLEFEATURES: return new org.opendaylight.yang.gen.v1.urn.opendaylight.table.types
+                    .rev131026.multipart.request.multipart.request.body.MultipartRequestTableFeaturesBuilder().build();
             case OFPMPPORTDESC: return new MultipartRequestPortDescBuilder().build();
             case OFPMPEXPERIMENTER: return new MultipartRequestExperimenterBuilder().build();
             default:throw new IllegalArgumentException("Unknown MultipartType " + type);
@@ -142,7 +137,8 @@ public final class MultipartRequestInputFactory {
             case OFPMPDESC:
                 return new MultipartRequestDescCaseBuilder().build();
             case OFPMPFLOW:
-                MultipartRequestFlowCaseBuilder multipartRequestFlowCaseBuilder = new MultipartRequestFlowCaseBuilder();
+                final MultipartRequestFlowCaseBuilder multipartRequestFlowCaseBuilder
+                        = new MultipartRequestFlowCaseBuilder();
                 MultipartRequestFlowBuilder multipartRequestFlowBuilder = new MultipartRequestFlowBuilder();
                 multipartRequestFlowBuilder.setTableId(OFConstants.OFPTT_ALL);
                 multipartRequestFlowBuilder.setOutPort(OFConstants.OFPP_ANY);
@@ -169,20 +165,25 @@ public final class MultipartRequestInputFactory {
             case OFPMPTABLE:
                 return new MultipartRequestTableCaseBuilder().build();
             case OFPMPPORTSTATS:
-                MultipartRequestPortStatsCaseBuilder multipartRequestPortStatsCaseBuilder = new MultipartRequestPortStatsCaseBuilder();
-                MultipartRequestPortStatsBuilder multipartRequestPortStatsBuilder = new MultipartRequestPortStatsBuilder();
+                MultipartRequestPortStatsCaseBuilder multipartRequestPortStatsCaseBuilder
+                        = new MultipartRequestPortStatsCaseBuilder();
+                MultipartRequestPortStatsBuilder multipartRequestPortStatsBuilder
+                        = new MultipartRequestPortStatsBuilder();
                 multipartRequestPortStatsBuilder.setPortNo(OFConstants.OFPP_ANY);
-                multipartRequestPortStatsCaseBuilder.setMultipartRequestPortStats(multipartRequestPortStatsBuilder.build());
+                multipartRequestPortStatsCaseBuilder
+                        .setMultipartRequestPortStats(multipartRequestPortStatsBuilder.build());
                 return multipartRequestPortStatsCaseBuilder.build();
             case OFPMPQUEUE:
-                MultipartRequestQueueCaseBuilder multipartRequestQueueCaseBuilder = new MultipartRequestQueueCaseBuilder();
+                MultipartRequestQueueCaseBuilder multipartRequestQueueCaseBuilder
+                        = new MultipartRequestQueueCaseBuilder();
                 MultipartRequestQueueBuilder multipartRequestQueueBuilder = new MultipartRequestQueueBuilder();
                 multipartRequestQueueBuilder.setPortNo(OFConstants.OFPP_ANY);
                 multipartRequestQueueBuilder.setQueueId(OFConstants.OFPQ_ALL);
                 multipartRequestQueueCaseBuilder.setMultipartRequestQueue(multipartRequestQueueBuilder.build());
                 return multipartRequestQueueCaseBuilder.build();
             case OFPMPGROUP:
-                MultipartRequestGroupCaseBuilder multipartRequestGroupCaseBuilder = new MultipartRequestGroupCaseBuilder();
+                MultipartRequestGroupCaseBuilder multipartRequestGroupCaseBuilder
+                        = new MultipartRequestGroupCaseBuilder();
                 MultipartRequestGroupBuilder multipartRequestGroupBuilder = new MultipartRequestGroupBuilder();
                 GroupId groupId = new GroupId(OFConstants.OFPG_ALL);
                 multipartRequestGroupBuilder.setGroupId(groupId);
@@ -193,24 +194,31 @@ public final class MultipartRequestInputFactory {
             case OFPMPGROUPFEATURES:
                 return new MultipartRequestGroupFeaturesCaseBuilder().build();
             case OFPMPMETER:
-                MultipartRequestMeterCaseBuilder multipartRequestMeterCaseBuilder = new MultipartRequestMeterCaseBuilder();
+                MultipartRequestMeterCaseBuilder multipartRequestMeterCaseBuilder
+                        = new MultipartRequestMeterCaseBuilder();
                 MultipartRequestMeterBuilder multipartRequestMeterBuilder = new MultipartRequestMeterBuilder();
                 MeterId meterId = new MeterId(OFConstants.OFPM_ALL);
                 multipartRequestMeterBuilder.setMeterId(meterId);
                 multipartRequestMeterCaseBuilder.setMultipartRequestMeter(multipartRequestMeterBuilder.build());
                 return multipartRequestMeterCaseBuilder.build();
             case OFPMPMETERCONFIG:
-                MultipartRequestMeterConfigCaseBuilder multipartRequestMeterConfigCaseBuilder = new MultipartRequestMeterConfigCaseBuilder();
-                MultipartRequestMeterConfigBuilder multipartRequestMeterConfigBuilder = new MultipartRequestMeterConfigBuilder();
+                MultipartRequestMeterConfigCaseBuilder multipartRequestMeterConfigCaseBuilder
+                        = new MultipartRequestMeterConfigCaseBuilder();
+                MultipartRequestMeterConfigBuilder multipartRequestMeterConfigBuilder
+                        = new MultipartRequestMeterConfigBuilder();
                 MeterId configMeterId = new MeterId(OFConstants.OFPM_ALL);
                 multipartRequestMeterConfigBuilder.setMeterId(configMeterId);
-                multipartRequestMeterConfigCaseBuilder.setMultipartRequestMeterConfig(multipartRequestMeterConfigBuilder.build());
+                multipartRequestMeterConfigCaseBuilder
+                        .setMultipartRequestMeterConfig(multipartRequestMeterConfigBuilder.build());
                 return multipartRequestMeterConfigCaseBuilder.build();
             case OFPMPMETERFEATURES:
                 return new MultipartRequestMeterFeaturesCaseBuilder().build();
             case OFPMPTABLEFEATURES:
-                MultipartRequestTableFeaturesCaseBuilder tableFeaturesCaseBuilder = new MultipartRequestTableFeaturesCaseBuilder();
-                tableFeaturesCaseBuilder.setMultipartRequestTableFeatures(new MultipartRequestTableFeaturesBuilder().build());
+                MultipartRequestTableFeaturesCaseBuilder tableFeaturesCaseBuilder
+                        = new MultipartRequestTableFeaturesCaseBuilder();
+                tableFeaturesCaseBuilder.setMultipartRequestTableFeatures(
+                        new MultipartRequestTableFeaturesBuilder().build()
+                );
                 return tableFeaturesCaseBuilder.build();
             case OFPMPPORTDESC:
                 return new MultipartRequestPortDescCaseBuilder().build();
index b5e719ee22ce7f4718d7aed08aeb7200ddcacaac..afae1caba1ce228bfb45424e0d7ecd3b546cc0e5 100644 (file)
@@ -36,7 +36,9 @@ public class ConfigurationServiceFactoryImpl implements ConfigurationServiceFact
     private static final Logger LOG = LoggerFactory.getLogger(ConfigurationServiceFactory.class);
 
     @Override
-    public ConfigurationService newInstance(final OpenflowProviderConfig providerConfig, final BundleContext bundleContext) {
+    public ConfigurationService newInstance(
+            final OpenflowProviderConfig providerConfig,
+            final BundleContext bundleContext) {
         return new ConfigurationServiceImpl(providerConfig, bundleContext);
     }
 
@@ -83,28 +85,30 @@ public class ConfigurationServiceFactoryImpl implements ConfigurationServiceFact
                     .build());
 
             LOG.info("Loading configuration from '{}' configuration file", OFConstants.CONFIG_FILE_ID);
-            Optional.ofNullable(bundleContext.getServiceReference(ConfigurationAdmin.class)).ifPresent(serviceReference -> {
-                final ConfigurationAdmin configurationAdmin = bundleContext.getService(serviceReference);
-
-                try {
-                    final Configuration configuration = configurationAdmin.getConfiguration(OFConstants.CONFIG_FILE_ID);
-
-                    Optional.ofNullable(configuration.getProperties()).ifPresent(properties -> {
-                        final Enumeration<String> keys = properties.keys();
-                        final Map<String, String> mapProperties = new HashMap<>(properties.size());
-
-                        while (keys.hasMoreElements()) {
-                            final String key = keys.nextElement();
-                            final String value = properties.get(key).toString();
-                            mapProperties.put(key, value);
+            Optional.ofNullable(bundleContext.getServiceReference(ConfigurationAdmin.class))
+                    .ifPresent(serviceReference -> {
+                        final ConfigurationAdmin configurationAdmin = bundleContext.getService(serviceReference);
+
+                        try {
+                            final Configuration configuration
+                                    = configurationAdmin.getConfiguration(OFConstants.CONFIG_FILE_ID);
+
+                            Optional.ofNullable(configuration.getProperties()).ifPresent(properties -> {
+                                final Enumeration<String> keys = properties.keys();
+                                final Map<String, String> mapProperties = new HashMap<>(properties.size());
+
+                                while (keys.hasMoreElements()) {
+                                    final String key = keys.nextElement();
+                                    final String value = properties.get(key).toString();
+                                    mapProperties.put(key, value);
+                                }
+
+                                update(mapProperties);
+                            });
+                        } catch (IOException e) {
+                            LOG.debug("Failed to load {} configuration file. Error {}", OFConstants.CONFIG_FILE_ID, e);
                         }
-
-                        update(mapProperties);
                     });
-                } catch (IOException e) {
-                    LOG.debug("Failed to load {} configuration file. Error {}", OFConstants.CONFIG_FILE_ID, e);
-                }
-            });
         }
 
         @Override
@@ -117,7 +121,10 @@ public class ConfigurationServiceFactoryImpl implements ConfigurationServiceFact
                         return;
                     }
 
-                    LOG.info("{} configuration property was changed from '{}' to '{}'", propertyName, originalValue, newValue);
+                    LOG.info("{} configuration property was changed from '{}' to '{}'",
+                            propertyName,
+                            originalValue,
+                            newValue);
                 } else {
                     if (Objects.isNull(newValue)) {
                         return;
index 0fc9f1d13efbb2c60db49a41eb030189e48e736a..e91cef4059c1cc29f58fb470a0c878e9750fc119 100644 (file)
@@ -132,7 +132,9 @@ public class OpenFlowProviderConfigImpl implements OpenflowProviderConfig {
     }
 
     @Override
-    public <E extends Augmentation<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow.provider.config.rev160510.OpenflowProviderConfig>> E getAugmentation(java.lang.Class<E> augmentationType) {
+    public <E extends Augmentation<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang
+            .openflow.provider.config.rev160510.OpenflowProviderConfig>> E getAugmentation(
+                    java.lang.Class<E> augmentationType) {
         return null;
     }
 
index 0f8ea8ae8365a2b3823ef10a3f2ac324824d6c30..01d54e0883eb0d0976975a9231da8ff681548d68 100644 (file)
@@ -97,6 +97,7 @@ public final class OpendaylightFlowTableStatisticsServiceImpl extends
             MultipartReplyTable replyBody = caseBody.getMultipartReplyTable();
             List<TableStats> swTablesStats = replyBody.getTableStats();
 
+            //TODO: Duplicate code: look at MultiReplyTranslatorUtil method translateTable
             for (TableStats swTableStats : swTablesStats) {
                 FlowTableAndStatisticsMapBuilder statisticsBuilder = new FlowTableAndStatisticsMapBuilder();
                 statisticsBuilder.setActiveFlows(new Counter32(swTableStats.getActiveCount()));