X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflow-protocol-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fopenflowjava%2Fprotocol%2Fimpl%2Futil%2FTypeKeyMakerFactory.java;h=7fef029c7c2a9a92ba93e74a08c5735513c8fd76;hb=2b5094b8ffd0e06dfaad372437e01ff1bd194623;hp=6530ee2c57de37d86f47cacaa98fa9ab2db1206b;hpb=f732586038a1a23ca775a1a7c73467cdc5899e05;p=openflowjava.git

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/TypeKeyMakerFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/TypeKeyMakerFactory.java
index 6530ee2c..7fef029c 100644
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/TypeKeyMakerFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/TypeKeyMakerFactory.java
@@ -1,92 +1,95 @@
-/*
- * Copyright (c) 2013 Pantheon Technologies s.r.o. 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.openflowjava.protocol.impl.util;
-
-import org.opendaylight.openflowjava.protocol.api.extensibility.MessageTypeKey;
-import org.opendaylight.openflowjava.protocol.api.keys.ActionSerializerKey;
-import org.opendaylight.openflowjava.protocol.api.keys.InstructionSerializerKey;
-import org.opendaylight.openflowjava.protocol.api.keys.MatchEntrySerializerKey;
-import org.opendaylight.openflowjava.protocol.api.keys.experimenter.ExperimenterActionSerializerKey;
-import org.opendaylight.openflowjava.protocol.api.keys.experimenter.ExperimenterInstructionSerializerKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.ExperimenterIdAction;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.ExperimenterIdInstruction;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.ExperimenterIdMatchEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.Experimenter;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.grouping.Action;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.instruction.rev130731.instructions.grouping.Instruction;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.ExperimenterClass;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.oxm.fields.grouping.MatchEntries;
-
-/**
- * Creates KeyMakers
- * @author michal.polkorab
- */
-public abstract class TypeKeyMakerFactory {
-
-    /**
-     * @param version openflow wire version that shall be used
-     *  in lookup key
-     * @return lookup key
-     */
-    public static TypeKeyMaker<MatchEntries> createMatchEntriesKeyMaker(short version) {
-        return new AbstractTypeKeyMaker<MatchEntries>(version) {
-            @Override
-            public MatchEntrySerializerKey<?, ?> make(MatchEntries entry) {
-                MatchEntrySerializerKey<?, ?> key;
-                key = new MatchEntrySerializerKey<>(getVersion(), entry.getOxmClass(),
-                        entry.getOxmMatchField());
-                if (entry.getOxmClass().equals(ExperimenterClass.class)) {
-                    key.setExperimenterId(entry.getAugmentation(ExperimenterIdMatchEntry.class)
-                            .getExperimenter().getValue());
-                    return key;
-                }
-                key.setExperimenterId(null);
-                return key;
-            }
-        };
-    }
-
-    /**
-     * @param version openflow wire version that shall be used
-     *  in lookup key
-     * @return lookup key
-     */
-    public static TypeKeyMaker<Action> createActionKeyMaker(short version) {
-        return new AbstractTypeKeyMaker<Action>(version) {
-            @Override
-            public MessageTypeKey<?> make(Action entry) {
-                if (entry.getType().equals(Experimenter.class)) {
-                    return new ExperimenterActionSerializerKey(getVersion(),
-                            entry.getAugmentation(ExperimenterIdAction.class).getExperimenter().getValue());
-                }
-                return new ActionSerializerKey<>(getVersion(), entry.getType(), null);
-            }
-        };
-    }
-
-    /**
-     * @param version openflow wire version that shall be used
-     *  in lookup key
-     * @return lookup key
-     */
-    public static TypeKeyMaker<Instruction> createInstructionKeyMaker(short version) {
-        return new AbstractTypeKeyMaker<Instruction>(version) {
-            @Override
-            public MessageTypeKey<?> make(Instruction entry) {
-                if (entry.getType().equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common
-                        .instruction.rev130731.Experimenter.class)) {
-                    return new ExperimenterInstructionSerializerKey(getVersion(),
-                            entry.getAugmentation(ExperimenterIdInstruction.class)
-                            .getExperimenter().getValue());
-                }
-                return new InstructionSerializerKey<>(getVersion(), entry.getType(), null);
-            }
-        };
-    }
-}
+/*
+ * Copyright (c) 2013 Pantheon Technologies s.r.o. 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.openflowjava.protocol.impl.util;
+
+import org.opendaylight.openflowjava.protocol.api.keys.ActionSerializerKey;
+import org.opendaylight.openflowjava.protocol.api.keys.InstructionSerializerKey;
+import org.opendaylight.openflowjava.protocol.api.keys.MatchEntrySerializerKey;
+import org.opendaylight.openflowjava.protocol.api.keys.MessageTypeKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.ExperimenterIdCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.ActionChoice;
+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.instruction.rev130731.instruction.grouping.InstructionChoice;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.instruction.rev130731.instructions.grouping.Instruction;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.ExperimenterClass;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry;
+
+/**
+ * Creates KeyMakers
+ * @author michal.polkorab
+ */
+public abstract class TypeKeyMakerFactory {
+
+    private TypeKeyMakerFactory() {
+        //not called
+    }
+    
+    /**
+     * @param version openflow wire version that shall be used
+     *  in lookup key
+     * @return lookup key
+     */
+    public static TypeKeyMaker<MatchEntry> createMatchEntriesKeyMaker(short version) {
+        return new AbstractTypeKeyMaker<MatchEntry>(version) {
+            @Override
+            public MatchEntrySerializerKey<?, ?> make(MatchEntry entry) {
+                MatchEntrySerializerKey<?, ?> key;
+                key = new MatchEntrySerializerKey<>(getVersion(), entry.getOxmClass(),
+                        entry.getOxmMatchField());
+                if (entry.getOxmClass().equals(ExperimenterClass.class)) {
+                    ExperimenterIdCase entryValue = (ExperimenterIdCase) entry.getMatchEntryValue();
+                    key.setExperimenterId(entryValue.getExperimenter().getExperimenter().getValue());
+                    return key;
+                }
+                key.setExperimenterId(null);
+                return key;
+            }
+        };
+    }
+
+    /**
+     * @param version openflow wire version that shall be used
+     *  in lookup key
+     * @return lookup key
+     */
+    public static TypeKeyMaker<Action> createActionKeyMaker(short version) {
+        return new AbstractTypeKeyMaker<Action>(version) {
+            @Override
+            public MessageTypeKey<?> make(Action entry) {
+                if (entry.getExperimenterId() != null) {
+                    return new ActionSerializerKey<>(getVersion(),
+                            (Class<ActionChoice>) entry.getActionChoice().getImplementedInterface(),
+                            entry.getExperimenterId().getValue());
+                }
+                return new ActionSerializerKey<>(getVersion(),
+                        (Class<ActionChoice>) entry.getActionChoice().getImplementedInterface(), null);
+            }
+        };
+    }
+
+    /**
+     * @param version openflow wire version that shall be used
+     *  in lookup key
+     * @return lookup key
+     */
+    public static TypeKeyMaker<Instruction> createInstructionKeyMaker(short version) {
+        return new AbstractTypeKeyMaker<Instruction>(version) {
+            @Override
+            public MessageTypeKey<?> make(Instruction entry) {
+                if (entry.getExperimenterId() != null) {
+                    return new InstructionSerializerKey<>(getVersion(),
+                            (Class<InstructionChoice>) entry.getInstructionChoice().getImplementedInterface(),
+                            entry.getExperimenterId().getValue());
+                }
+                return new InstructionSerializerKey<>(getVersion(),
+                        (Class<InstructionChoice>) entry.getInstructionChoice().getImplementedInterface(), null);
+            }
+        };
+    }
+}