From 7c6d451b165dec82a7651ed08f44a8347bbd8914 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sat, 16 May 2015 18:01:17 +0200 Subject: [PATCH] Remove unused imports Eclipse-reported unused imports -- remove them. Change-Id: I0ecfda5cd3730ee685740f300d7268898f5d748c Signed-off-by: Robert Varga --- .../api/ConverterExtensionActionKeyTest.java | 11 ++++----- .../api/ConverterExtensionMatchKeyTest.java | 13 ++++------ .../nicira/NiciraExtensionProvider.java | 24 ++++--------------- .../convertor/action/MultipathConvertor.java | 11 ++++----- .../convertor/action/OutputRegConvertor.java | 7 +++--- .../convertor/action/RegLoadConvertor.java | 13 +++++----- .../convertor/action/ResubmitConvertor.java | 7 +++--- .../convertor/match/TunIdConvertor.java | 13 ++++------ .../match/test/TunIpv4SrcConverterTest.java | 4 ---- .../FlowCapableTransactionServiceImpl.java | 4 ++-- .../impl/services/SalEchoServiceImpl.java | 1 - .../consumer/SimpleDropFirewallCli.java | 18 +++++++------- 12 files changed, 44 insertions(+), 82 deletions(-) diff --git a/extension/openflowplugin-extension-api/src/test/java/org/opendaylight/openflowplugin/extension/api/ConverterExtensionActionKeyTest.java b/extension/openflowplugin-extension-api/src/test/java/org/opendaylight/openflowplugin/extension/api/ConverterExtensionActionKeyTest.java index 4e23332342..f2159a80e9 100644 --- a/extension/openflowplugin-extension-api/src/test/java/org/opendaylight/openflowplugin/extension/api/ConverterExtensionActionKeyTest.java +++ b/extension/openflowplugin-extension-api/src/test/java/org/opendaylight/openflowplugin/extension/api/ConverterExtensionActionKeyTest.java @@ -1,18 +1,15 @@ /** * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. - * + * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ package org.opendaylight.openflowplugin.extension.api; -import org.junit.Assert; -import org.junit.Test; -import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.Match; /** - * + * */ public class ConverterExtensionActionKeyTest { @@ -28,12 +25,12 @@ public class ConverterExtensionActionKeyTest { // ConverterExtensionMatchKey key2 = new ConverterExtensionMatchKey(Match.class); // ConverterExtensionMatchKey key3 = new ConverterExtensionMatchKey(SpecialMatch.class); // ConverterExtensionMatchKey key4 = new ConverterExtensionMatchKey(SpecialMatch.class); -// +// // Assert.assertEquals(key1, key2); // Assert.assertEquals(key3, key4); // Assert.assertNotEquals(key1, key4); // } -// +// // private static interface SpecialMatch extends Match { // // nobody // } diff --git a/extension/openflowplugin-extension-api/src/test/java/org/opendaylight/openflowplugin/extension/api/ConverterExtensionMatchKeyTest.java b/extension/openflowplugin-extension-api/src/test/java/org/opendaylight/openflowplugin/extension/api/ConverterExtensionMatchKeyTest.java index dc43966123..45850a5fd6 100644 --- a/extension/openflowplugin-extension-api/src/test/java/org/opendaylight/openflowplugin/extension/api/ConverterExtensionMatchKeyTest.java +++ b/extension/openflowplugin-extension-api/src/test/java/org/opendaylight/openflowplugin/extension/api/ConverterExtensionMatchKeyTest.java @@ -1,19 +1,14 @@ /** * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. - * + * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ package org.opendaylight.openflowplugin.extension.api; -import org.junit.Assert; -import org.junit.Test; -import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action; -import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.OutputActionCase; - /** - * + * */ public class ConverterExtensionMatchKeyTest { @@ -26,12 +21,12 @@ public class ConverterExtensionMatchKeyTest { // ConverterExtensionActionKey key2 = new ConverterExtensionActionKey(OutputActionCase.class); // ConverterExtensionActionKey key3 = new ConverterExtensionActionKey(SpecialAction.class); // ConverterExtensionActionKey key4 = new ConverterExtensionActionKey(SpecialAction.class); -// +// // Assert.assertEquals(key1, key2); // Assert.assertEquals(key3, key4); // Assert.assertNotEquals(key1, key4); // } -// +// // private static interface SpecialAction extends Action { // // nobody // } diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/NiciraExtensionProvider.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/NiciraExtensionProvider.java index 6eef32ced0..0d2487aaf4 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/NiciraExtensionProvider.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/NiciraExtensionProvider.java @@ -7,9 +7,9 @@ */ package org.opendaylight.openflowplugin.extension.vendor.nicira; +import com.google.common.base.Preconditions; import java.util.HashSet; import java.util.Set; - import org.opendaylight.openflowjava.nx.api.NiciraUtil; import org.opendaylight.openflowjava.nx.codec.action.MultipathCodec; import org.opendaylight.openflowjava.nx.codec.action.OutputRegCodec; @@ -80,20 +80,6 @@ import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.match.R import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.match.TunIPv4SrcConvertor; import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.match.TunIdConvertor; import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.ActionChoice; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionMultipath; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionOutputReg; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionRegLoad; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionRegMove; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionResubmit; - -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionSetNshc1; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionSetNshc2; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionSetNshc3; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionSetNshc4; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionSetNsi; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionSetNsp; - import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.add.flow.input.instructions.instruction.instruction.apply.actions._case.apply.actions.action.action.NxActionMultipathRpcAddFlowApplyActionsCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.add.flow.input.instructions.instruction.instruction.apply.actions._case.apply.actions.action.action.NxActionOutputRegRpcAddFlowApplyActionsCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.add.flow.input.instructions.instruction.instruction.apply.actions._case.apply.actions.action.action.NxActionRegLoadRpcAddFlowApplyActionsCase; @@ -221,8 +207,6 @@ import org.opendaylight.yangtools.concepts.ObjectRegistration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Preconditions; - /** * */ @@ -279,7 +263,7 @@ public class NiciraExtensionProvider implements AutoCloseable { * @param extensionConverterRegistrator */ public void setExtensionConverterRegistrator( - ExtensionConverterRegistrator extensionConverterRegistrator) { + final ExtensionConverterRegistrator extensionConverterRegistrator) { this.extensionConverterRegistrator = extensionConverterRegistrator; } @@ -464,8 +448,8 @@ public class NiciraExtensionProvider implements AutoCloseable { * @param actionConvertor */ private void registerAction13( - Class actionCaseType, - ConvertorActionToOFJava actionConvertor) { + final Class actionCaseType, + final ConvertorActionToOFJava actionConvertor) { TypeVersionKey key = new TypeVersionKey<>(actionCaseType, EncodeConstants.OF13_VERSION_ID); registrations.add(extensionConverterRegistrator.registerActionConvertor(key, actionConvertor)); } diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/MultipathConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/MultipathConvertor.java index 45b7df4309..3857aeb370 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/MultipathConvertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/MultipathConvertor.java @@ -15,7 +15,6 @@ import org.opendaylight.openflowplugin.extension.api.ConvertorActionToOFJava; import org.opendaylight.openflowplugin.extension.api.path.ActionPath; import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.CodecPreconditionException; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.ActionBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionMultipath; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionMultipathBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.multipath.grouping.NxActionMultipath; @@ -35,7 +34,7 @@ public class MultipathConvertor implements ConvertorActionFromOFJava { @Override - public org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action convert(Action input, ActionPath path) { + public org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action convert(final Action input, final ActionPath path) { NxActionMultipath action = ((ActionMultipath) input.getActionChoice()).getNxActionMultipath(); DstBuilder dstBuilder = new DstBuilder(); dstBuilder.setDstChoice(RegMoveConvertor.resolveDst(action.getDst())); @@ -50,11 +49,11 @@ public class MultipathConvertor implements return resolveAction(builder.build(), path); } - private static int resolveStart(int ofsNBints) { + private static int resolveStart(final int ofsNBints) { return extractSub(ofsNBints, 10, 6); } - private static int resolveEnd(int ofsNBints) { + private static int resolveEnd(final int ofsNBints) { int ofs = extractSub(ofsNBints, 10, 6); int nBits = extractSub(ofsNBints, 6, 0); return ofs + nBits; @@ -66,7 +65,7 @@ public class MultipathConvertor implements return rightShifted & mask; } - private static org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action resolveAction(NxMultipath value, ActionPath path) { + private static org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action resolveAction(final NxMultipath value, final ActionPath path) { switch (path) { case NODES_NODE_TABLE_FLOW_INSTRUCTIONS_INSTRUCTION_WRITEACTIONSCASE_WRITEACTIONS_ACTION_ACTION_EXTENSIONLIST_EXTENSION: return new NxActionMultipathNodesNodeTableFlowWriteActionsCaseBuilder().setNxMultipath(value).build(); @@ -82,7 +81,7 @@ public class MultipathConvertor implements } @Override - public Action convert(org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action nxActionArg) { + public Action convert(final org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action nxActionArg) { Preconditions.checkArgument(nxActionArg instanceof NxActionMultipathGrouping); NxActionMultipathGrouping nxAction = (NxActionMultipathGrouping) nxActionArg; diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/OutputRegConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/OutputRegConvertor.java index 2481f78804..054b23b766 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/OutputRegConvertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/OutputRegConvertor.java @@ -14,7 +14,6 @@ import org.opendaylight.openflowplugin.extension.api.ConvertorActionToOFJava; import org.opendaylight.openflowplugin.extension.api.path.ActionPath; import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.CodecPreconditionException; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.ActionBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionOutputReg; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionOutputRegBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.output.reg.grouping.NxActionOutputReg; @@ -40,7 +39,7 @@ public class OutputRegConvertor implements ConvertorActionFromOFJava { @Override - public org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action convert(Action input, ActionPath path) { + public org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action convert(final Action input, final ActionPath path) { NxActionOutputReg action = ((ActionOutputReg) input.getActionChoice()).getNxActionOutputReg(); SrcBuilder srcBuilder = new SrcBuilder(); srcBuilder.setSrcChoice(RegMoveConvertor.resolveSrc(action.getSrc())); @@ -51,7 +50,7 @@ public class OutputRegConvertor implements return resolveAction(builder.build(), path); } - private static org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action resolveAction(NxOutputReg value, ActionPath path) { + private static org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action resolveAction(final NxOutputReg value, final ActionPath path) { switch (path) { case NODES_NODE_TABLE_FLOW_INSTRUCTIONS_INSTRUCTION_WRITEACTIONSCASE_WRITEACTIONS_ACTION_ACTION_EXTENSIONLIST_EXTENSION: return new NxActionOutputRegNodesNodeTableFlowWriteActionsCaseBuilder().setNxOutputReg(value).build(); @@ -67,7 +66,7 @@ public class OutputRegConvertor implements } @Override - public Action convert(org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action nxActionArg) { + public Action convert(final org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action nxActionArg) { Preconditions.checkArgument(nxActionArg instanceof NxActionOutputRegGrouping); NxActionOutputRegGrouping nxAction = (NxActionOutputRegGrouping) nxActionArg; Src src = nxAction.getNxOutputReg().getSrc(); diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/RegLoadConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/RegLoadConvertor.java index 878110aa59..32766c46a0 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/RegLoadConvertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/RegLoadConvertor.java @@ -13,7 +13,6 @@ import org.opendaylight.openflowplugin.extension.api.ConvertorActionToOFJava; import org.opendaylight.openflowplugin.extension.api.path.ActionPath; import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.CodecPreconditionException; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.ActionBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionRegLoad; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionRegLoadBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.reg.load.grouping.NxActionRegLoad; @@ -36,7 +35,7 @@ public class RegLoadConvertor implements ConvertorActionFromOFJava { @Override - public org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action convert(Action input, ActionPath path) { + public org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action convert(final Action input, final ActionPath path) { NxActionRegLoad actionRegLoad = ((ActionRegLoad) input.getActionChoice()).getNxActionRegLoad(); DstBuilder dstBuilder = new DstBuilder(); dstBuilder.setDstChoice(RegMoveConvertor.resolveDst(actionRegLoad.getDst())); @@ -48,11 +47,11 @@ public class RegLoadConvertor implements return resolveAction(nxRegLoadBuilder.build(), path); } - private static int resolveStart(int ofsNBints) { + private static int resolveStart(final int ofsNBints) { return extractSub(ofsNBints, 10, 6); } - private static int resolveEnd(int ofsNBints) { + private static int resolveEnd(final int ofsNBints) { int ofs = extractSub(ofsNBints, 10, 6); int nBits = extractSub(ofsNBints, 6, 0); return ofs + nBits; @@ -64,8 +63,8 @@ public class RegLoadConvertor implements return rightShifted & mask; } - private static org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action resolveAction(NxRegLoad value, - ActionPath path) { + private static org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action resolveAction(final NxRegLoad value, + final ActionPath path) { switch (path) { case NODES_NODE_TABLE_FLOW_INSTRUCTIONS_INSTRUCTION_WRITEACTIONSCASE_WRITEACTIONS_ACTION_ACTION_EXTENSIONLIST_EXTENSION: return new NxActionRegLoadNodesNodeTableFlowWriteActionsCaseBuilder().setNxRegLoad(value).build(); @@ -81,7 +80,7 @@ public class RegLoadConvertor implements } @Override - public Action convert(org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action nxActionArg) { + public Action convert(final org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action nxActionArg) { Preconditions.checkArgument(nxActionArg instanceof NxActionRegLoadGrouping); NxActionRegLoadGrouping nxAction = (NxActionRegLoadGrouping) nxActionArg; diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/ResubmitConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/ResubmitConvertor.java index e19a207ba5..5efa765a1b 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/ResubmitConvertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/ResubmitConvertor.java @@ -16,7 +16,6 @@ import org.opendaylight.openflowplugin.extension.api.ConvertorActionToOFJava; import org.opendaylight.openflowplugin.extension.api.path.ActionPath; import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.CodecPreconditionException; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.ActionBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionResubmit; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionResubmitBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.resubmit.grouping.NxActionResubmit; @@ -37,7 +36,7 @@ public class ResubmitConvertor implements ConvertorActionFromOFJava { @Override - public org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action convert(Action input, ActionPath path) { + public org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action convert(final Action input, final ActionPath path) { NxActionResubmit action = ((ActionResubmit) input.getActionChoice()).getNxActionResubmit(); NxResubmitBuilder builder = new NxResubmitBuilder(); builder.setInPort(action.getInPort()); @@ -45,7 +44,7 @@ public class ResubmitConvertor implements return resolveAction(builder.build(), path); } - private static org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action resolveAction(NxResubmit value, ActionPath path) { + private static org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action resolveAction(final NxResubmit value, final ActionPath path) { switch (path) { case NODES_NODE_TABLE_FLOW_INSTRUCTIONS_INSTRUCTION_WRITEACTIONSCASE_WRITEACTIONS_ACTION_ACTION_EXTENSIONLIST_EXTENSION: return new NxActionResubmitNodesNodeTableFlowWriteActionsCaseBuilder().setNxResubmit(value).build(); @@ -61,7 +60,7 @@ public class ResubmitConvertor implements } @Override - public Action convert(org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action nxActionArg) { + public Action convert(final org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action nxActionArg) { Preconditions.checkArgument(nxActionArg instanceof NxActionResubmitGrouping); NxActionResubmitGrouping nxAction = (NxActionResubmitGrouping) nxActionArg; ActionResubmitBuilder builder = new ActionResubmitBuilder(); diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TunIdConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TunIdConvertor.java index 07bfcbdfbf..bec7eeef37 100644 --- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TunIdConvertor.java +++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TunIdConvertor.java @@ -8,6 +8,7 @@ package org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.match; import com.google.common.base.Optional; +import java.math.BigInteger; import org.opendaylight.openflowplugin.extension.api.ConvertorFromOFJava; import org.opendaylight.openflowplugin.extension.api.ConvertorToOFJava; import org.opendaylight.openflowplugin.extension.api.ExtensionAugment; @@ -15,9 +16,6 @@ import org.opendaylight.openflowplugin.extension.api.path.MatchPath; import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.CodecPreconditionException; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm1Class; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.TunnelIdCase; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.TunnelIdCaseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.tunnel.id._case.TunnelIdBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.tun.id.grouping.TunIdValuesBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.TunIdCaseValue; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.TunIdCaseValueBuilder; @@ -34,7 +32,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.ni import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.nxm.nx.tun.id.grouping.NxmNxTunId; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.nxm.nx.tun.id.grouping.NxmNxTunIdBuilder; import org.opendaylight.yangtools.yang.binding.Augmentation; -import java.math.BigInteger; /** * @author msunal @@ -50,14 +47,14 @@ public class TunIdConvertor implements ConvertorToOFJava, ConvertorF * org.opendaylight.openflowplugin.extension.api.path.AugmentationPath) */ @Override - public ExtensionAugment> convert(MatchEntry input, MatchPath path) { + public ExtensionAugment> convert(final MatchEntry input, final MatchPath path) { TunIdCaseValue tunnelIdCase = ((TunIdCaseValue) input.getMatchEntryValue()); return resolveAugmentation(new NxmNxTunIdBuilder().setValue(tunnelIdCase.getTunIdValues().getValue()).build(), path, NxmNxTunIdKey.class); } - private static ExtensionAugment> resolveAugmentation(NxmNxTunId value, - MatchPath path, Class key) { + private static ExtensionAugment> resolveAugmentation(final NxmNxTunId value, + final MatchPath path, final Class key) { switch (path) { case FLOWSSTATISTICSUPDATE_FLOWANDSTATISTICSMAPLIST_MATCH: return new ExtensionAugment<>(NxAugMatchNotifUpdateFlowStats.class, @@ -83,7 +80,7 @@ public class TunIdConvertor implements ConvertorToOFJava, ConvertorF * .rev140714.general.extension.grouping.Extension) */ @Override - public MatchEntry convert(Extension extension) { + public MatchEntry convert(final Extension extension) { Optional matchGrouping = MatchUtil.tunIdResolver.getExtension(extension); if (!matchGrouping.isPresent()) { throw new CodecPreconditionException(extension); diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/test/TunIpv4SrcConverterTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/test/TunIpv4SrcConverterTest.java index e86a370daa..03df651e3b 100644 --- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/test/TunIpv4SrcConverterTest.java +++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/test/TunIpv4SrcConverterTest.java @@ -1,13 +1,9 @@ package org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.match.test; import static org.junit.Assert.assertEquals; - import org.junit.Test; import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.match.TunIPv4SrcConvertor; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Address; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.ExtensionBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.nxm.nx.tun.ipv4.src.grouping.NxmNxTunIpv4Src; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.nxm.nx.tun.ipv4.src.grouping.NxmNxTunIpv4SrcBuilder; public class TunIpv4SrcConverterTest { diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/FlowCapableTransactionServiceImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/FlowCapableTransactionServiceImpl.java index 2b0096035d..79db452d37 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/FlowCapableTransactionServiceImpl.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/FlowCapableTransactionServiceImpl.java @@ -20,16 +20,16 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.transaction.rev150304. import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.transaction.rev150304.SendBarrierInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.BarrierInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.BarrierInputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.FlowModInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader; import org.opendaylight.yangtools.yang.common.RpcError; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class FlowCapableTransactionServiceImpl extends CommonService implements FlowCapableTransactionService { - private static final Logger LOG = org.slf4j.LoggerFactory.getLogger(FlowCapableTransactionServiceImpl.class); + private static final Logger LOG = LoggerFactory.getLogger(FlowCapableTransactionServiceImpl.class); public FlowCapableTransactionServiceImpl(final RequestContextStack requestContextStack, final DeviceContext deviceContext) { super(requestContextStack, deviceContext); diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/SalEchoServiceImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/SalEchoServiceImpl.java index 03527f2d30..dd160c2131 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/SalEchoServiceImpl.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/SalEchoServiceImpl.java @@ -21,7 +21,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.echo.service.rev150305.Send import org.opendaylight.yang.gen.v1.urn.opendaylight.echo.service.rev150305.SendEchoOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.EchoInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.EchoInputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.FlowModInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader; import org.opendaylight.yangtools.yang.common.RpcError; import org.opendaylight.yangtools.yang.common.RpcResult; diff --git a/samples/sample-consumer/src/main/java/org/opendaylight/openflowplugin/openflow/samples/consumer/SimpleDropFirewallCli.java b/samples/sample-consumer/src/main/java/org/opendaylight/openflowplugin/openflow/samples/consumer/SimpleDropFirewallCli.java index f3d1fee604..301d9e84d3 100644 --- a/samples/sample-consumer/src/main/java/org/opendaylight/openflowplugin/openflow/samples/consumer/SimpleDropFirewallCli.java +++ b/samples/sample-consumer/src/main/java/org/opendaylight/openflowplugin/openflow/samples/consumer/SimpleDropFirewallCli.java @@ -9,7 +9,6 @@ package org.opendaylight.openflowplugin.openflow.samples.consumer; import java.util.Collections; import java.util.List; - import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Prefix; import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.DropActionCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.DropActionCaseBuilder; @@ -17,7 +16,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.acti import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.ActionBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.AddFlowInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.AddFlowInputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.MatchBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.InstructionsBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.MatchBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.instruction.ApplyActionsCaseBuilder; @@ -32,20 +30,20 @@ public class SimpleDropFirewallCli { private SimpleDropFirewall service; - public void setService(SimpleDropFirewall service) { + public void setService(final SimpleDropFirewall service) { this.service = service; } /** * Form of input is: - * + * * node name node-connector number source ip-address destinatinon ip-address - * + * * @param cliInput * Parsed input from CLI * @return */ - public AddFlowInput createTcpFlow(List cliInput) { + public AddFlowInput createTcpFlow(final List cliInput) { AddFlowInputBuilder ret = new AddFlowInputBuilder(); ret.setNode(nodeFromString(cliInput.get(0))); @@ -72,20 +70,20 @@ public class SimpleDropFirewallCli { // ApplyActionsCaseBuilder aaBldr = new ApplyActionsCaseBuilder(); aaBldr.setApplyActions(new ApplyActionsBuilder().setAction(actions).build()); - + InstructionBuilder instructionBldr = new InstructionBuilder(); instructionBldr.setInstruction(aaBldr.build()); - + List isntructions = Collections.singletonList(instructionBldr.build()); InstructionsBuilder instructionsBldr = new InstructionsBuilder(); instructionsBldr.setInstruction(isntructions); - + ret.setInstructions(instructionsBldr.build()); return ret.build(); } - private NodeRef nodeFromString(String string) { + private NodeRef nodeFromString(final String string) { // TODO Auto-generated method stub return null; } -- 2.36.6