[jbossws-commits] JBossWS SVN: r19035 - in common/trunk/src: test/java/org/jboss/test/ws/common/configuration and 1 other directory.

Author: asoldano Date: 2014-10-29 10:02:39 -0400 (Wed, 29 Oct 2014) New Revision: 19035 Added: common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigDelegateHandlerComparator.java common/trunk/src/test/java/org/jboss/test/ws/common/configuration/ConfigDelegateHandlerComparatorTestCase.java Log: [JBWS-3848] Restore ConfigDelegateHandlerComparator Copied: common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigDelegateHandlerComparator.java (from rev 19025, common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigDelegateHandlerComparator.java) =================================================================== --- common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigDelegateHandlerComparator.java (rev 0) +++ common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigDelegateHandlerComparator.java 2014-10-29 14:02:39 UTC (rev 19035) @@ -0,0 +1,56 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.common.configuration; + +import java.io.Serializable; +import java.util.Comparator; + +import javax.xml.ws.handler.Handler; + +/** + * A Handler comparator properly dealing with PRE/POST ConfigDelegateHandler instances + * + * @author alessio.soldano(a)jboss.com + * @since 06-Jun-2012 + * + */ +@SuppressWarnings("rawtypes") +public final class ConfigDelegateHandlerComparator<T extends Handler> implements Comparator<T>, Serializable +{ + static final long serialVersionUID = 5045492270035185007L; + + @Override + public int compare(Handler o1, Handler o2) + { + int i1 = 0; + int i2 = 0; + if (o1 instanceof ConfigDelegateHandler) + { + i1 = ((ConfigDelegateHandler) o1).isPre() ? -1 : 1; + } + if (o2 instanceof ConfigDelegateHandler) + { + i2 = ((ConfigDelegateHandler) o2).isPre() ? -1 : 1; + } + return i1 - i2; + } +} \ No newline at end of file Copied: common/trunk/src/test/java/org/jboss/test/ws/common/configuration/ConfigDelegateHandlerComparatorTestCase.java (from rev 19025, common/trunk/src/test/java/org/jboss/test/ws/common/configuration/ConfigDelegateHandlerComparatorTestCase.java) =================================================================== --- common/trunk/src/test/java/org/jboss/test/ws/common/configuration/ConfigDelegateHandlerComparatorTestCase.java (rev 0) +++ common/trunk/src/test/java/org/jboss/test/ws/common/configuration/ConfigDelegateHandlerComparatorTestCase.java 2014-10-29 14:02:39 UTC (rev 19035) @@ -0,0 +1,129 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.common.configuration; + +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; + +import javax.xml.ws.handler.Handler; +import javax.xml.ws.handler.MessageContext; + +import junit.framework.TestCase; + +import org.jboss.ws.common.configuration.ConfigDelegateHandler; +import org.jboss.ws.common.configuration.ConfigDelegateHandlerComparator; + +/** + * Test the ConfigDelegateHandlerComparator + * + * @author alessio.soldano(a)jboss.org + * @since 07-Jun-2012 + */ +public class ConfigDelegateHandlerComparatorTestCase extends TestCase +{ + public void testComparator() throws Exception + { + List<NamedHandler> list = new LinkedList<NamedHandler>(); + list.add(new TestConfigDelegateHandler(new TestHandler("post1"), false)); + list.add(new TestHandler("h1")); + list.add(new TestConfigDelegateHandler(new TestHandler("post2"), false)); + list.add(new TestConfigDelegateHandler(new TestHandler("pre1"), true)); + list.add(new TestConfigDelegateHandler(new TestHandler("pre2"), true)); + list.add(new TestHandler("h2")); + list.add(new TestHandler("h3")); + list.add(new TestHandler("h4")); + list.add(new TestHandler("h5")); + list.add(new TestConfigDelegateHandler(new TestHandler("post3"), false)); + list.add(new TestConfigDelegateHandler(new TestHandler("pre3"), true)); + list.add(new TestConfigDelegateHandler(new TestHandler("pre4"), true)); + list.add(new TestHandler("h6")); + list.add(new TestConfigDelegateHandler(new TestHandler("post4"), false)); + + Collections.sort(list, new ConfigDelegateHandlerComparator<Handler<MessageContext>>()); + + StringBuilder sb = new StringBuilder(); + for (NamedHandler h : list) + { + sb.append(h.getName()); + sb.append(" "); + } + assertEquals("pre1 pre2 pre3 pre4 h1 h2 h3 h4 h5 h6 post1 post2 post3 post4", sb.toString().trim()); + } + + private static interface NamedHandler extends Handler<MessageContext> + { + + public String getName(); + + } + + private static class TestConfigDelegateHandler extends ConfigDelegateHandler<MessageContext> implements NamedHandler + { + + public TestConfigDelegateHandler(Handler<MessageContext> delegate, boolean isPre) + { + super(delegate, isPre); + } + + @Override + public String getName() + { + return delegate instanceof NamedHandler ? ((NamedHandler) delegate).getName() : null; + } + + } + + private static class TestHandler implements NamedHandler + { + + private String name; + + public TestHandler(String name) + { + this.name = name; + } + + @Override + public String getName() + { + return name; + } + + @Override + public boolean handleMessage(MessageContext context) + { + return false; + } + + @Override + public boolean handleFault(MessageContext context) + { + return false; + } + + @Override + public void close(MessageContext context) + { + } + } +}