From 5ae6e54ead5176b3daa66c1bc817b30fb605eadc Mon Sep 17 00:00:00 2001 From: Ladislav Borak Date: Tue, 5 May 2015 14:41:28 +0200 Subject: [PATCH] Bug 3106 - Untangle directories - Util class was moved into new package to remove cycle dependecy Change-Id: Ib49a6770b19e9a1aae31825c7505bfec406a11d5 Signed-off-by: Ladislav Borak --- .../protocol/pcep/impl/AbstractPCEPSessionNegotiator.java | 1 + .../org/opendaylight/protocol/pcep/impl/PCEPSessionImpl.java | 1 + .../pcep/impl/message/PCEPMonitoringReplyMessageParser.java | 3 ++- .../protocol/pcep/impl/message/PCEPReplyMessageParser.java | 2 +- .../org/opendaylight/protocol/pcep/impl/{ => spi}/Util.java | 2 +- .../protocol/pcep/impl/FiniteStateMachineTest.java | 1 + .../test/java/org/opendaylight/protocol/pcep/impl/MockPCE.java | 2 +- .../opendaylight/protocol/pcep/impl/PCEPSessionImplTest.java | 1 + .../java/org/opendaylight/protocol/pcep/impl/UtilTest.java | 1 + 9 files changed, 10 insertions(+), 4 deletions(-) rename pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/{ => spi}/Util.java (99%) diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/AbstractPCEPSessionNegotiator.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/AbstractPCEPSessionNegotiator.java index bf85961409..a18b00e802 100644 --- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/AbstractPCEPSessionNegotiator.java +++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/AbstractPCEPSessionNegotiator.java @@ -19,6 +19,7 @@ import javax.net.ssl.SSLContext; import javax.net.ssl.SSLEngine; import org.opendaylight.controller.config.yang.pcep.impl.Tls; import org.opendaylight.protocol.framework.AbstractSessionNegotiator; +import org.opendaylight.protocol.pcep.impl.spi.Util; import org.opendaylight.protocol.pcep.impl.tls.SslContextFactory; import org.opendaylight.protocol.pcep.spi.PCEPErrors; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.message.rev131007.Keepalive; diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPSessionImpl.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPSessionImpl.java index 55a9fe8a26..7c93cae836 100644 --- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPSessionImpl.java +++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPSessionImpl.java @@ -27,6 +27,7 @@ import org.opendaylight.protocol.pcep.PCEPCloseTermination; import org.opendaylight.protocol.pcep.PCEPSession; import org.opendaylight.protocol.pcep.PCEPSessionListener; import org.opendaylight.protocol.pcep.TerminationReason; +import org.opendaylight.protocol.pcep.impl.spi.Util; import org.opendaylight.protocol.pcep.spi.PCEPErrors; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.stats.rev141006.pcep.session.state.LocalPref; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.stats.rev141006.pcep.session.state.Messages; diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPMonitoringReplyMessageParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPMonitoringReplyMessageParser.java index e5b670af5d..e9221dc2ec 100644 --- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPMonitoringReplyMessageParser.java +++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPMonitoringReplyMessageParser.java @@ -14,7 +14,7 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import java.util.ArrayList; import java.util.List; -import org.opendaylight.protocol.pcep.impl.Util; +import org.opendaylight.protocol.pcep.impl.spi.Util; import org.opendaylight.protocol.pcep.spi.AbstractMessageParser; import org.opendaylight.protocol.pcep.spi.MessageUtil; import org.opendaylight.protocol.pcep.spi.ObjectRegistry; @@ -37,6 +37,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.pcmonrep.message.PcmonrepMessageBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.rp.object.Rp; + /** * Parser for {@link Pcmonrep} * @see Path Monitoring Replay Message diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPReplyMessageParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPReplyMessageParser.java index 12d41e572d..61471ed1f3 100644 --- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPReplyMessageParser.java +++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPReplyMessageParser.java @@ -13,7 +13,7 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import java.util.ArrayList; import java.util.List; -import org.opendaylight.protocol.pcep.impl.Util; +import org.opendaylight.protocol.pcep.impl.spi.Util; import org.opendaylight.protocol.pcep.spi.AbstractMessageParser; import org.opendaylight.protocol.pcep.spi.MessageUtil; import org.opendaylight.protocol.pcep.spi.ObjectRegistry; 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/spi/Util.java similarity index 99% rename from pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/Util.java rename to pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/spi/Util.java index f32527ec99..54dcb0751f 100644 --- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/Util.java +++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/spi/Util.java @@ -5,7 +5,7 @@ * 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.protocol.pcep.impl; +package org.opendaylight.protocol.pcep.impl.spi; import java.util.Arrays; import java.util.List; diff --git a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/FiniteStateMachineTest.java b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/FiniteStateMachineTest.java index 4cb597b1aa..6e50e59024 100644 --- a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/FiniteStateMachineTest.java +++ b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/FiniteStateMachineTest.java @@ -17,6 +17,7 @@ import org.junit.Before; import org.junit.Ignore; import org.junit.Test; import org.opendaylight.controller.config.yang.pcep.impl.Tls; +import org.opendaylight.protocol.pcep.impl.spi.Util; import org.opendaylight.protocol.pcep.spi.PCEPErrors; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.message.rev131007.Keepalive; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.message.rev131007.Open; diff --git a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/MockPCE.java b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/MockPCE.java index 53d7526fa1..1031d87b7e 100644 --- a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/MockPCE.java +++ b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/MockPCE.java @@ -9,10 +9,10 @@ package org.opendaylight.protocol.pcep.impl; import java.util.ArrayList; import java.util.List; - import org.opendaylight.protocol.pcep.PCEPSession; import org.opendaylight.protocol.pcep.PCEPSessionListener; import org.opendaylight.protocol.pcep.PCEPTerminationReason; +import org.opendaylight.protocol.pcep.impl.spi.Util; import org.opendaylight.protocol.pcep.spi.PCEPErrors; 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.open.object.Open; diff --git a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPSessionImplTest.java b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPSessionImplTest.java index db3d81e59e..3b1d63a325 100644 --- a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPSessionImplTest.java +++ b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPSessionImplTest.java @@ -14,6 +14,7 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; import org.opendaylight.protocol.pcep.TerminationReason; +import org.opendaylight.protocol.pcep.impl.spi.Util; import org.opendaylight.protocol.pcep.spi.PCEPErrors; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.stats.rev141006.pcep.session.state.LocalPref; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.stats.rev141006.pcep.session.state.Messages; diff --git a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/UtilTest.java b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/UtilTest.java index 47983206cc..0e16343407 100644 --- a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/UtilTest.java +++ b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/UtilTest.java @@ -12,6 +12,7 @@ import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import org.junit.Assert; import org.junit.Test; +import org.opendaylight.protocol.pcep.impl.spi.Util; import org.opendaylight.protocol.pcep.spi.PCEPErrors; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.message.rev131007.Pcerr; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.Message; -- 2.36.6