Removed unused code that used guava. 99/899/1
authorDana Kutenicsova <dkutenic@cisco.com>
Mon, 19 Aug 2013 07:06:19 +0000 (09:06 +0200)
committerDana Kutenicsova <dkutenic@cisco.com>
Mon, 19 Aug 2013 07:06:19 +0000 (09:06 +0200)
Removed guava dependency.

Change-Id: Iae48ec5948b6909ee5030c8c5d162cd6ab903de0
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>
pcep/api/pom.xml
pcep/testtool/pom.xml
pcep/testtool/src/main/java/org/opendaylight/protocol/pcep/testtool/Main.java
pcep/testtool/src/main/java/org/opendaylight/protocol/pcep/testtool/TestingSessionListener.java
pcep/testtool/src/main/java/org/opendaylight/protocol/pcep/testtool/TestingSessionListenerFactory.java

index fcda4596ed9127c660eb2e14b5ef710044085675..a5384e2c0da73099ecbed4435257ca61480ef5b3 100644 (file)
                        <artifactId>util</artifactId>
             <version>${project.version}</version>
                </dependency>
-               <dependency>
-                       <groupId>com.google.guava</groupId>
-                       <artifactId>guava</artifactId>
-                       <version>${guava.version}</version>
-               </dependency>
                <dependency>
                        <groupId>org.slf4j</groupId>
                        <artifactId>slf4j-api</artifactId>
index e18589a3ecbc46f8cdaf3980bd6c52f2025069a9..6a339306775719ae731a68d1cef0606ff2d2618b 100644 (file)
                        <artifactId>pcep-impl</artifactId>
             <version>${project.version}</version>
                </dependency>
-               <dependency>
-                       <groupId>com.google.guava</groupId>
-                       <artifactId>guava</artifactId>
-                       <version>${guava.version}</version>
-               </dependency>
                <dependency>
                        <groupId>org.slf4j</groupId>
                        <artifactId>slf4j-api</artifactId>
index 73760d15d599408f915ee8b70ca6ff0da5f755da..8790a4809bc35b1847d70057b5a5e277c7c3ab35 100644 (file)
@@ -79,10 +79,6 @@ public class Main {
                boolean active = false;
                boolean versioned = false;
                boolean instant = false;
-               String autoResponseMessagesSrc = null;
-               String sendNowMessageSrc = null;
-               String periodicallySendMessagesSrc = null;
-               int period = 0;
                int timeout = 0;
 
                int i = 0;
@@ -114,17 +110,6 @@ public class Main {
                                        timeout = Integer.valueOf(args[i + 1]);
                                        i++;
                                }
-                       } else if (args[i].equalsIgnoreCase("--autoResponseMessages") || args[i].equalsIgnoreCase("-arm")) {
-                               autoResponseMessagesSrc = args[i + 1];
-                               i++;
-                       } else if (args[i].equalsIgnoreCase("--periodicallySendMessages") || args[i].equalsIgnoreCase("-psm")) {
-                               periodicallySendMessagesSrc = args[i + 1];
-                               i++;
-                               period = Integer.valueOf(args[i + 1]);
-                               i++;
-                       } else if (args[i].equalsIgnoreCase("--sendNowMessage") || args[i].equalsIgnoreCase("-snm")) {
-                               sendNowMessageSrc = args[i + 1];
-                               i++;
                        } else {
                                System.out.println("WARNING: Unrecognized argument: " + args[i]);
                        }
@@ -137,7 +122,7 @@ public class Main {
                        deadTimerValue = keepAliveValue * 4;
                }
 
-               final PCEPSessionListenerFactory slf = new TestingSessionListenerFactory(autoResponseMessagesSrc, periodicallySendMessagesSrc, period, sendNowMessageSrc);
+               final PCEPSessionListenerFactory slf = new TestingSessionListenerFactory();
                final PCEPSessionProposalFactory spf = new PCEPSessionProposalFactoryImpl(deadTimerValue, keepAliveValue, stateful, active, versioned, instant, timeout);
                final PCEPSessionProposalCheckerFactory spcf = new PCEPSessionProposalCheckerFactoryImpl();
 
index 35cfe2160a99963544789308b1b23ded1c6f8d86..c259eee9cf19e066c0dbe56ef1485a39782e67b9 100644 (file)
@@ -7,18 +7,8 @@
  */
 package org.opendaylight.protocol.pcep.testtool;
 
-import groovy.lang.GroovyClassLoader;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.util.ArrayList;
-import java.util.LinkedList;
 import java.util.List;
-import java.util.Queue;
-import java.util.Timer;
-import java.util.TimerTask;
 
 import org.opendaylight.protocol.concepts.IPv4Address;
 import org.opendaylight.protocol.concepts.IPv4Prefix;
@@ -44,94 +34,13 @@ public class TestingSessionListener extends PCEPSessionListener {
 
        private static final Logger logger = LoggerFactory.getLogger(TestingSessionListener.class);
 
-       public final Queue<PCEPMessage> replyMessages;
-       public final Queue<PCEPMessage> sendNowMessages;
-       public final Queue<PCEPMessage> periodicalMessages;
-       public final int period;
-
-       private class MessageTimer extends TimerTask {
-               private final PCEPMessage message;
-               private final PCEPSession session;
-
-               MessageTimer(final PCEPMessage message, final PCEPSession session) {
-                       this.message = message;
-                       this.session = session;
-               }
-
-               @Override
-               public void run() {
-                       this.session.sendMessage(this.message);
-               }
-       }
-
        public TestingSessionListener() {
-               /**
-                * default messages are set to null
-                */
-               this.period = 0;
-               this.replyMessages = new LinkedList<PCEPMessage>();
-               this.sendNowMessages = new LinkedList<PCEPMessage>();
-               this.periodicalMessages = new LinkedList<PCEPMessage>();
-       }
-
-       public TestingSessionListener(final String autoResponseMessagesSrc, final String periodicallySendMessagesSrc, final int period,
-                       final String sendNowMessageSrc) {
-               this.period = period;
-               this.replyMessages = this.loadMessageGeneratorFromFile(autoResponseMessagesSrc).generateMessages();
-               this.sendNowMessages = this.loadMessageGeneratorFromFile(sendNowMessageSrc).generateMessages();
-               this.periodicalMessages = this.loadMessageGeneratorFromFile(periodicallySendMessagesSrc).generateMessages();
-       }
-
-       /**
-        * Periodically send messages from loaded queue.
-        * 
-        * @param session the session used to send message
-        * @param period the time between two sent messages
-        */
-       public void sendPeriodically(final PCEPSession session, final int seconds) {
-               if (!this.periodicalMessages.isEmpty()) {
-                       this.sendPeriodically(session, this.periodicalMessages.poll(), seconds);
-               } else
-                       logger.debug("DON'T starting PERIODICAL sender. Messages queue is empty.");
-       }
-
-       /**
-        * Periodically send specified message.
-        * 
-        * @param session the session used to send message
-        * @param message the message to send
-        * @param period the time between two sent messages
-        */
-       public void sendPeriodically(final PCEPSession session, final PCEPMessage message, final int seconds) {
-               final Timer timer = new Timer();
-
-               logger.debug("Starting periodical sending of messages with {} seconds delay.", seconds);
-               timer.schedule(new MessageTimer(message, session), seconds * 1000);
-       }
-
-       public void sendNow(final PCEPSession session) {
-               if (!this.sendNowMessages.isEmpty()) {
-                       final PCEPMessage msg = this.sendNowMessages.poll();
-                       this.sendNow(session, msg);
-               } else
-                       logger.debug("DON'T sending NOW. Messages queue is empty.");
-       }
-
-       public void sendNow(final PCEPSession session, final PCEPMessage message) {
-               logger.debug("Sending NOW.");
-               session.sendMessage(message);
        }
 
        @Override
        public void onMessage(final PCEPSession session, final PCEPMessage message) {
                logger.debug("Received message: {}", message);
                this.messages.add(message);
-
-               // if (!this.replyMessages.isEmpty()) {
-               // this.logger.debug("Remaining messages in queue: {}", this.replyMessages.size());
-               // session.sendMessage(this.replyMessages.poll());
-               // } else
-               // this.logger.debug("Reply messages queue is empty.");
        }
 
        @Override
@@ -142,8 +51,6 @@ public class TestingSessionListener extends PCEPSessionListener {
                subs.add(new EROIPPrefixSubobject<Prefix<?>>(new IPv4Prefix(new IPv4Address(new byte[] { 2, 2, 2, 2 }), 32), false));
                session.sendMessage(new PCEPXRAddTunnelMessage(new PCEPLspObject(23, false, false, false, false), new PCEPEndPointsObject<IPv4Address>(new IPv4Address(new byte[] {
                                1, 1, 1, 1 }), new IPv4Address(new byte[] { 2, 2, 2, 2 })), new PCEPExplicitRouteObject(subs, false)));
-               this.sendNow(session);
-               this.sendPeriodically(session, this.period);
        }
 
        @Override
@@ -153,58 +60,6 @@ public class TestingSessionListener extends PCEPSessionListener {
 
        @Override
        public void onSessionTerminated(final PCEPSession session, final TerminationReason cause) {
-               logger.debug("Session terminated. Cause : " + cause.toString());
-       }
-
-       private MessageGeneratorService loadMessageGeneratorFromFile(final String path) {
-               try {
-                       final GroovyClassLoader l = new GroovyClassLoader();
-                       final Class<?> scriptClass = l.parseClass(new File(path));
-                       l.close();
-                       logger.debug("Loaded '{}'", path);
-                       final MessageGeneratorService generator = (MessageGeneratorService) scriptClass.newInstance();
-                       logger.debug("Instantiated '{}'", path);
-                       return generator;
-               } catch (final Exception e) {
-                       logger.error("Failed to load '{}'. Using empty queue.", path);
-                       return new MessageGeneratorService() {
-
-                               @Override
-                               public Queue<PCEPMessage> generateMessages() {
-                                       return new LinkedList<PCEPMessage>();
-                               }
-                       };
-               }
-
-       }
-
-       @SuppressWarnings("unused")
-       private MessageGeneratorService loadMessageGeneratorFormSysResource(final String path) {
-               try {
-                       final InputStream is = this.getClass().getResourceAsStream(path);
-                       final BufferedReader buffReader = new BufferedReader(new InputStreamReader(is));
-                       final StringBuilder script = new StringBuilder();
-                       String scriptLine;
-                       while ((scriptLine = buffReader.readLine()) != null) {
-                               script.append(scriptLine + "\n");
-                       }
-                       final GroovyClassLoader l = new GroovyClassLoader();
-                       final Class<?> scriptClass = l.parseClass(script.toString());
-                       l.close();
-                       logger.debug("Loaded '{}'", path);
-                       final MessageGeneratorService generator = (MessageGeneratorService) scriptClass.newInstance();
-                       logger.debug("Instantiated '{}'", path);
-                       return generator;
-
-               } catch (final Exception e) {
-                       logger.error("Failed to load '{}' from system resources. Using empty queue.", path);
-                       return new MessageGeneratorService() {
-
-                               @Override
-                               public Queue<PCEPMessage> generateMessages() {
-                                       return new LinkedList<PCEPMessage>();
-                               }
-                       };
-               }
+               logger.debug("Session terminated. Cause : {}", cause.toString());
        }
 }
index 9274e0c97e9955fecc02a9995d80fc6a9e2c94ab..ee3672ae27db68183b608beaa27ce9b4ccf942cf 100644 (file)
@@ -17,21 +17,13 @@ import org.opendaylight.protocol.pcep.PCEPSessionListenerFactory;
  */
 public class TestingSessionListenerFactory extends PCEPSessionListenerFactory {
 
-       private final String autoResponseMessagesSrc;
-       private final String periodicallySendMessagesSrc;
-       private final String sendNowMessageSrc;
-       private final int period;
+       public TestingSessionListenerFactory() {
 
-       public TestingSessionListenerFactory(String autoResponseMessagesSrc, String periodicallySendMessagesSrc, int period, String sendNowMessageSrc) {
-               this.autoResponseMessagesSrc = autoResponseMessagesSrc;
-               this.periodicallySendMessagesSrc = periodicallySendMessagesSrc;
-               this.period = period;
-               this.sendNowMessageSrc = sendNowMessageSrc;
        }
 
        @Override
-       public PCEPSessionListener getSessionListener(InetAddress address) {
-               return new TestingSessionListener(this.autoResponseMessagesSrc, this.periodicallySendMessagesSrc, this.period, this.sendNowMessageSrc);
+       public PCEPSessionListener getSessionListener(final InetAddress address) {
+               return new TestingSessionListener();
        }
 
 }