Revert "BUG-47 : unfinished PCEP migration to generated DTOs."

[bgpcep.git] / pcep / impl / src / main / java / org / opendaylight / protocol / pcep / impl / Util.java

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/Util.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/Util.java
index ff5180240b93d9760e7b7b7dec4a4cb49cfdcec1..c4b936ff68e707a17539b2330f3a20081638486e 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/Util.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/Util.java
@@ -8,25 +8,12 @@
 package org.opendaylight.protocol.pcep.impl;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 
+import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.protocol.concepts.AddressFamily;
 import org.opendaylight.protocol.concepts.NetworkAddress;
-import org.opendaylight.protocol.pcep.PCEPErrorMapping;
-import org.opendaylight.protocol.pcep.PCEPErrorMapping.PCEPErrorIdentifier;
-import org.opendaylight.protocol.pcep.PCEPErrors;
-import org.opendaylight.protocol.util.ByteArray;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.message.rev131007.PcerrBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.Message;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.OpenObject;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.pcerr.message.PcerrMessageBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.pcerr.message.pcerr.message.ErrorType;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.pcerr.message.pcerr.message.Errors;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.pcerr.message.pcerr.message.ErrorsBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.pcerr.message.pcerr.message.error.type.SessionBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.pcerr.message.pcerr.message.error.type.session.Open;
 
 /**
  * Utilities used in pcep-impl
@@ -41,22 +28,25 @@ public final class Util {
 
                private final HashMap<KV, V> kvToV = new HashMap<KV, V>();
 
-               public void put(final K key, final KV keyValue, final V value) {
+               public void put(K key, KV keyValue, V value) {
                        this.kToKv.put(key, keyValue);
                        this.kvToV.put(keyValue, value);
                }
 
-               public KV getKeyValueFromKey(final K key) {
+               public KV getKeyValueFromKey(K key) {
                        return this.kToKv.get(key);
                }
 
-               public V getValueFromKeyValue(final KV keyValue) {
+               public V getValueFromKeyValue(KV keyValue) {
                        return this.kvToV.get(keyValue);
                }
        }
 
-       public static <T extends NetworkAddress<T>> List<T> parseAddresses(final byte[] bytes, int offset, final AddressFamily<T> family,
-                       final int addrLen) {
+       public static int getPadding(int length, int padding) {
+               return (padding - (length % padding)) % padding;
+       }
+
+       public static <T extends NetworkAddress<T>> List<T> parseAddresses(byte[] bytes, int offset, AddressFamily<T> family, int addrLen) {
                final List<T> addresses = new ArrayList<T>();
 
                while (bytes.length > offset) {
@@ -67,28 +57,10 @@ public final class Util {
                return addresses;
        }
 
-       public static <T extends NetworkAddress<T>> void putAddresses(final byte[] destBytes, int offset, final List<T> addresses,
-                       final int addrLen) {
+       public static <T extends NetworkAddress<T>> void putAddresses(byte[] destBytes, int offset, List<T> addresses, int addrLen) {
                for (final T address : addresses) {
                        System.arraycopy(address.getAddress(), 0, destBytes, offset, addrLen);
                        offset += addrLen;
                }
        }
-
-       public static int getPadding(final int length, final int padding) {
-               return (padding - (length % padding)) % padding;
-       }
-
-       public static Message createErrorMessage(final PCEPErrors e, final OpenObject t) {
-               final PcerrBuilder errMessageBuilder = new PcerrBuilder();
-               final PCEPErrorMapping mapping = PCEPErrorMapping.getInstance();
-               final PCEPErrorIdentifier id = mapping.getFromErrorsEnum(e);
-               final Errors err = new ErrorsBuilder().setType(id.type).setValue(id.value).build();
-               if (t == null)
-                       return errMessageBuilder.setPcerrMessage(new PcerrMessageBuilder().setErrors(Arrays.asList(err)).build()).build();
-               else {
-                       final ErrorType type = new SessionBuilder().setOpen((Open) t).build();
-                       return errMessageBuilder.setPcerrMessage(new PcerrMessageBuilder().setErrors(Arrays.asList(err)).setErrorType(type).build()).build();
-               }
-       }
 }