From 3b2c669b25bfcb5a3c3f06ff9180d85143bebb2a Mon Sep 17 00:00:00 2001 From: Erik Brakkee Date: Sat, 13 Aug 2011 22:36:08 +0200 Subject: [PATCH] Config no longer implements Identifiable because this was in violation of the contract anyway. Added ConfigurationProvider interface RouterConfigServer is now an internal interface of the XMLRouter. --- .../xmlrouter/config/Configuration.java | 64 +++++++++++++++++++ .../config/ConfigurationProvider.java | 41 ++++++++++++ .../xmlrouter/impl/CompositeConfig.java | 22 +++---- .../xmlrouter/impl/CompositeRouterConfig.java | 2 - .../org/wamblee/xmlrouter/impl}/Config.java | 10 ++- .../xmlrouter/impl}/ConfigException.java | 4 +- .../wamblee/xmlrouter/impl/ConfigImpl.java | 16 ++--- .../xmlrouter/impl/ExtendedConfig.java | 1 - .../xmlrouter/impl/ExtendedRouterConfig.java | 1 - .../xmlrouter/impl/RobustIdentifiable.java | 1 - .../wamblee/xmlrouter/impl}/RouterConfig.java | 7 +- .../xmlrouter/impl}/RouterConfigService.java | 2 +- .../xmlrouter/impl/SingleRouterConfig.java | 32 +++++----- .../impl/XMLRouterConfigService.java | 9 +-- .../impl/XMLRouterConfigurationImpl.java | 1 - .../xmlrouter/impl/CompositeConfigTest.java | 14 ++-- .../xmlrouter/impl/ConfigImplTest.java | 11 ++-- .../impl/RobustIdentifiableTest.java | 1 - .../impl/SingleRouterConfigTest.java | 15 ++--- .../impl/XMLRouterConfigServiceTest.java | 2 - .../xmlrouter/impl/XMLRouterFunctionTest.java | 1 - .../wamblee/xmlrouter/impl/XMLRouterTest.java | 4 +- 22 files changed, 174 insertions(+), 87 deletions(-) create mode 100644 config/src/main/java/org/wamblee/xmlrouter/config/Configuration.java create mode 100644 config/src/main/java/org/wamblee/xmlrouter/config/ConfigurationProvider.java rename {config/src/main/java/org/wamblee/xmlrouter/config => impl/src/main/java/org/wamblee/xmlrouter/impl}/Config.java (85%) rename {config/src/main/java/org/wamblee/xmlrouter/config => impl/src/main/java/org/wamblee/xmlrouter/impl}/ConfigException.java (90%) rename {config/src/main/java/org/wamblee/xmlrouter/config => impl/src/main/java/org/wamblee/xmlrouter/impl}/RouterConfig.java (81%) rename {config/src/main/java/org/wamblee/xmlrouter/config => impl/src/main/java/org/wamblee/xmlrouter/impl}/RouterConfigService.java (97%) diff --git a/config/src/main/java/org/wamblee/xmlrouter/config/Configuration.java b/config/src/main/java/org/wamblee/xmlrouter/config/Configuration.java new file mode 100644 index 0000000..f758fdc --- /dev/null +++ b/config/src/main/java/org/wamblee/xmlrouter/config/Configuration.java @@ -0,0 +1,64 @@ +/* + * Copyright 2005-2011 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.wamblee.xmlrouter.config; + +import java.util.Collection; + +/** + * This class represents a particular configuration of the XML router as + * provided by one configuration provider. There can be multiple configuration + * providers, each providing it's own part of the configuration. + * + * @author Erik Brakkee + */ +public final class Configuration { + + private Collection documentTypes; + private Collection transformations; + private Collection filters; + + /** + * Constructs the configuration object. Null objects will be ignored. + * DocumentTypes must have unique content-based ids (see + * {@link Identifiable}), with the same for transformations and filters. + * Objects with the same id as another object processed earlier will be + * ignored. + * + * @param aDocumentTypes + * Document types. + * @param aTransformations + * Transformations. + * @param aFilters + * Filters. + */ + public Configuration(Collection aDocumentTypes, + Collection aTransformations, Collection aFilters) { + documentTypes = aDocumentTypes; + transformations = aTransformations; + } + + public Collection getDocumentTypes() { + return documentTypes; + } + + public Collection getTransformations() { + return transformations; + } + + public Collection getFilters() { + return filters; + } +} diff --git a/config/src/main/java/org/wamblee/xmlrouter/config/ConfigurationProvider.java b/config/src/main/java/org/wamblee/xmlrouter/config/ConfigurationProvider.java new file mode 100644 index 0000000..3b5588c --- /dev/null +++ b/config/src/main/java/org/wamblee/xmlrouter/config/ConfigurationProvider.java @@ -0,0 +1,41 @@ +/* + * Copyright 2005-2011 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.wamblee.xmlrouter.config; + +/** + * The configuration provider must be imp0lemneted to provide a part of the + * configuration. The XML Router calls the configuration provider repeatedly to + * find out the current configuration. + * + * How the XML router obtains an instance of the configuration provider depends + * on how the \ XML router is deployed. In an OSGi type deployment, this could + * be for instance through an extender pattern whereby the XML router discovers + * configuration providers at runtime. + * + * @author Erik Brakkee + * + */ +public interface ConfigurationProvider { + + /** + * Gets the current configuration to use. An implementation may cache the + * configuration objects an return it a second time or it may return a new + * configuration object each time. + * + * @return Configuration, may not be null. + */ + Configuration getConfiguration(); +} diff --git a/impl/src/main/java/org/wamblee/xmlrouter/impl/CompositeConfig.java b/impl/src/main/java/org/wamblee/xmlrouter/impl/CompositeConfig.java index 0c6100d..3b45a3e 100644 --- a/impl/src/main/java/org/wamblee/xmlrouter/impl/CompositeConfig.java +++ b/impl/src/main/java/org/wamblee/xmlrouter/impl/CompositeConfig.java @@ -23,8 +23,6 @@ import java.util.List; import java.util.Set; import org.wamblee.xmlrouter.common.Id; -import org.wamblee.xmlrouter.config.Config; -import org.wamblee.xmlrouter.config.ConfigException; import org.wamblee.xmlrouter.config.Identifiable; /** @@ -37,17 +35,17 @@ import org.wamblee.xmlrouter.config.Identifiable; public class CompositeConfig> implements ExtendedConfig { - private static final Id ID = new Id("compositeconfig"); + private static final String PREFIX = "compositeconfig"; private static final String READ_ONLY_INSTANCE = "read only instance"; private Class type; - private Set> ids; + private Set prefixes; private List> valueIds; private List values; public CompositeConfig(Class aType) { type = aType; - ids = new HashSet>(); + prefixes = new HashSet(); valueIds = new ArrayList>(); values = new ArrayList(); } @@ -58,17 +56,17 @@ public class CompositeConfig> implements } @Override - public Id getId() { - return ID; + public String getPrefix() { + return PREFIX; } public void addConfig(Config aConfig) { notNull("aConfig", aConfig); - if (ids.contains(aConfig.getId())) { - throw new ConfigException("duplicate id '" + - aConfig.getId().toString() + "'"); + if (prefixes.contains(aConfig.getPrefix())) { + throw new ConfigException("duplicate prefix '" + + aConfig.getPrefix() + "'"); } - String prefix = aConfig.getId().getId() + "."; + String prefix = aConfig.getPrefix() + "."; for (T item : aConfig.values()) { Id newId = new Id(prefix + item.getId()); if (valueIds.contains(newId)) { @@ -77,7 +75,7 @@ public class CompositeConfig> implements } } - ids.add(aConfig.getId()); + prefixes.add(aConfig.getPrefix()); for (T item : aConfig.values()) { Id newId = new Id(prefix + item.getId()); diff --git a/impl/src/main/java/org/wamblee/xmlrouter/impl/CompositeRouterConfig.java b/impl/src/main/java/org/wamblee/xmlrouter/impl/CompositeRouterConfig.java index fa01c06..2b578bd 100644 --- a/impl/src/main/java/org/wamblee/xmlrouter/impl/CompositeRouterConfig.java +++ b/impl/src/main/java/org/wamblee/xmlrouter/impl/CompositeRouterConfig.java @@ -18,10 +18,8 @@ package org.wamblee.xmlrouter.impl; import java.util.Collection; import org.wamblee.xmlrouter.common.Id; -import org.wamblee.xmlrouter.config.Config; import org.wamblee.xmlrouter.config.DocumentType; import org.wamblee.xmlrouter.config.Filter; -import org.wamblee.xmlrouter.config.RouterConfig; import org.wamblee.xmlrouter.config.Transformation; public class CompositeRouterConfig implements ExtendedRouterConfig { diff --git a/config/src/main/java/org/wamblee/xmlrouter/config/Config.java b/impl/src/main/java/org/wamblee/xmlrouter/impl/Config.java similarity index 85% rename from config/src/main/java/org/wamblee/xmlrouter/config/Config.java rename to impl/src/main/java/org/wamblee/xmlrouter/impl/Config.java index aa5c540..2699255 100644 --- a/config/src/main/java/org/wamblee/xmlrouter/config/Config.java +++ b/impl/src/main/java/org/wamblee/xmlrouter/impl/Config.java @@ -13,11 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.xmlrouter.config; +package org.wamblee.xmlrouter.impl; import java.util.Collection; import org.wamblee.xmlrouter.common.Id; +import org.wamblee.xmlrouter.config.Identifiable; /** * Interface for managing a set of configuration items of a given type with @@ -28,7 +29,12 @@ import org.wamblee.xmlrouter.common.Id; * @param * Type for which ids are generated. */ -public interface Config extends Identifiable { +public interface Config { + + /** + * @return Prefix to use for ids of contained identifiable objects. + */ + String getPrefix(); /** * @return The type of contained object. diff --git a/config/src/main/java/org/wamblee/xmlrouter/config/ConfigException.java b/impl/src/main/java/org/wamblee/xmlrouter/impl/ConfigException.java similarity index 90% rename from config/src/main/java/org/wamblee/xmlrouter/config/ConfigException.java rename to impl/src/main/java/org/wamblee/xmlrouter/impl/ConfigException.java index 5944bfe..08a040d 100644 --- a/config/src/main/java/org/wamblee/xmlrouter/config/ConfigException.java +++ b/impl/src/main/java/org/wamblee/xmlrouter/impl/ConfigException.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.xmlrouter.config; +package org.wamblee.xmlrouter.impl; /** - * Exception thrown in case of duplicates. + * Exception thrown in case of configuration errors. * * @author Erik Brakkee */ diff --git a/impl/src/main/java/org/wamblee/xmlrouter/impl/ConfigImpl.java b/impl/src/main/java/org/wamblee/xmlrouter/impl/ConfigImpl.java index 777ecd0..ae2351f 100644 --- a/impl/src/main/java/org/wamblee/xmlrouter/impl/ConfigImpl.java +++ b/impl/src/main/java/org/wamblee/xmlrouter/impl/ConfigImpl.java @@ -23,8 +23,6 @@ import java.util.HashMap; import java.util.Map; import org.wamblee.xmlrouter.common.Id; -import org.wamblee.xmlrouter.config.Config; -import org.wamblee.xmlrouter.config.ConfigException; import org.wamblee.xmlrouter.config.Identifiable; /** @@ -38,17 +36,17 @@ public abstract class ConfigImpl> implements ExtendedConfig { private Class type; - private Id id; + private String prefix; private Map, T> registered; /** * Constructs the object. */ - public ConfigImpl(Class aType, Id aId) { + public ConfigImpl(Class aType, String aPrefix) { notNull("type", aType); - notNull("id", aId); + notNull("id", aPrefix); type = aType; - id = aId; + prefix = aPrefix; registered = new HashMap, T>(); } @@ -65,7 +63,7 @@ public abstract class ConfigImpl> implements */ public ConfigImpl(ConfigImpl aConfig) { notNull("config", aConfig); - id = aConfig.id; + prefix = aConfig.prefix; registered = new HashMap, T>(); for (Map.Entry, T> entry : aConfig.registered.entrySet()) { registered.put(entry.getKey(), entry.getValue()); @@ -73,8 +71,8 @@ public abstract class ConfigImpl> implements } @Override - public Id getId() { - return id; + public String getPrefix() { + return prefix; } /* diff --git a/impl/src/main/java/org/wamblee/xmlrouter/impl/ExtendedConfig.java b/impl/src/main/java/org/wamblee/xmlrouter/impl/ExtendedConfig.java index 2c1b781..5fa8f03 100644 --- a/impl/src/main/java/org/wamblee/xmlrouter/impl/ExtendedConfig.java +++ b/impl/src/main/java/org/wamblee/xmlrouter/impl/ExtendedConfig.java @@ -15,7 +15,6 @@ */ package org.wamblee.xmlrouter.impl; -import org.wamblee.xmlrouter.config.Config; import org.wamblee.xmlrouter.config.Identifiable; public interface ExtendedConfig> extends Config { diff --git a/impl/src/main/java/org/wamblee/xmlrouter/impl/ExtendedRouterConfig.java b/impl/src/main/java/org/wamblee/xmlrouter/impl/ExtendedRouterConfig.java index f8b0f75..8cda134 100644 --- a/impl/src/main/java/org/wamblee/xmlrouter/impl/ExtendedRouterConfig.java +++ b/impl/src/main/java/org/wamblee/xmlrouter/impl/ExtendedRouterConfig.java @@ -15,7 +15,6 @@ */ package org.wamblee.xmlrouter.impl; -import org.wamblee.xmlrouter.config.RouterConfig; /** * Extended interface for the router configuration used internally. diff --git a/impl/src/main/java/org/wamblee/xmlrouter/impl/RobustIdentifiable.java b/impl/src/main/java/org/wamblee/xmlrouter/impl/RobustIdentifiable.java index 2e63a97..f371975 100644 --- a/impl/src/main/java/org/wamblee/xmlrouter/impl/RobustIdentifiable.java +++ b/impl/src/main/java/org/wamblee/xmlrouter/impl/RobustIdentifiable.java @@ -21,7 +21,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.wamblee.xmlrouter.common.Id; -import org.wamblee.xmlrouter.config.ConfigException; import org.wamblee.xmlrouter.config.Identifiable; /** diff --git a/config/src/main/java/org/wamblee/xmlrouter/config/RouterConfig.java b/impl/src/main/java/org/wamblee/xmlrouter/impl/RouterConfig.java similarity index 81% rename from config/src/main/java/org/wamblee/xmlrouter/config/RouterConfig.java rename to impl/src/main/java/org/wamblee/xmlrouter/impl/RouterConfig.java index 1462250..120ffbd 100644 --- a/config/src/main/java/org/wamblee/xmlrouter/config/RouterConfig.java +++ b/impl/src/main/java/org/wamblee/xmlrouter/impl/RouterConfig.java @@ -13,7 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.xmlrouter.config; +package org.wamblee.xmlrouter.impl; + +import org.wamblee.xmlrouter.config.DocumentType; +import org.wamblee.xmlrouter.config.Filter; +import org.wamblee.xmlrouter.config.Identifiable; +import org.wamblee.xmlrouter.config.Transformation; /** * Configuration API for the XML router. diff --git a/config/src/main/java/org/wamblee/xmlrouter/config/RouterConfigService.java b/impl/src/main/java/org/wamblee/xmlrouter/impl/RouterConfigService.java similarity index 97% rename from config/src/main/java/org/wamblee/xmlrouter/config/RouterConfigService.java rename to impl/src/main/java/org/wamblee/xmlrouter/impl/RouterConfigService.java index 9656441..8738ed1 100644 --- a/config/src/main/java/org/wamblee/xmlrouter/config/RouterConfigService.java +++ b/impl/src/main/java/org/wamblee/xmlrouter/impl/RouterConfigService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.wamblee.xmlrouter.config; +package org.wamblee.xmlrouter.impl; import org.wamblee.xmlrouter.common.Id; diff --git a/impl/src/main/java/org/wamblee/xmlrouter/impl/SingleRouterConfig.java b/impl/src/main/java/org/wamblee/xmlrouter/impl/SingleRouterConfig.java index a72e9a2..195f72d 100644 --- a/impl/src/main/java/org/wamblee/xmlrouter/impl/SingleRouterConfig.java +++ b/impl/src/main/java/org/wamblee/xmlrouter/impl/SingleRouterConfig.java @@ -16,10 +16,8 @@ package org.wamblee.xmlrouter.impl; import org.wamblee.xmlrouter.common.Id; -import org.wamblee.xmlrouter.config.Config; import org.wamblee.xmlrouter.config.DocumentType; import org.wamblee.xmlrouter.config.Filter; -import org.wamblee.xmlrouter.config.RouterConfig; import org.wamblee.xmlrouter.config.Transformation; /** @@ -31,7 +29,7 @@ import org.wamblee.xmlrouter.config.Transformation; public class SingleRouterConfig implements ExtendedRouterConfig { public static final class DocumentConfig extends ConfigImpl { - public DocumentConfig(Id aId) { + public DocumentConfig(String aId) { super(DocumentType.class, aId); } @@ -47,7 +45,7 @@ public class SingleRouterConfig implements ExtendedRouterConfig { public static final class TransformationConfig extends ConfigImpl { - public TransformationConfig(Id aId) { + public TransformationConfig(String aId) { super(Transformation.class, aId); } @@ -62,7 +60,7 @@ public class SingleRouterConfig implements ExtendedRouterConfig { } public static final class FilterConfig extends ConfigImpl { - public FilterConfig(Id aId) { + public FilterConfig(String aId) { super(Filter.class, aId); } @@ -76,7 +74,7 @@ public class SingleRouterConfig implements ExtendedRouterConfig { } } - private Id id; + private String prefix; private DocumentConfig documentTypes; private TransformationConfig transformations; @@ -85,20 +83,18 @@ public class SingleRouterConfig implements ExtendedRouterConfig { /** * Constructs a router configuration. * - * @param aId + * @param aPrefix * Unique id for this configuration. */ - public SingleRouterConfig(Id aId) { - id = aId; - documentTypes = new DocumentConfig(new Id(aId.getId() + - ".documenttypes")); - transformations = new TransformationConfig(new Id(aId.getId() + - ".transformations")); - filters = new FilterConfig(new Id(aId.getId() + ".filters")); + public SingleRouterConfig(String aPrefix) { + prefix = aPrefix; + documentTypes = new DocumentConfig(aPrefix + ".documenttypes"); + transformations = new TransformationConfig(aPrefix + ".transformations"); + filters = new FilterConfig(aPrefix + ".filters"); } public SingleRouterConfig(SingleRouterConfig aConfig) { - id = aConfig.id; + prefix = aConfig.prefix; documentTypes = new DocumentConfig(aConfig.documentTypes); transformations = new TransformationConfig(aConfig.transformations); filters = new FilterConfig(aConfig.filters); @@ -106,7 +102,11 @@ public class SingleRouterConfig implements ExtendedRouterConfig { @Override public Id getId() { - return id; + return new Id(prefix); + } + + public String getPrefix() { + return prefix; } @Override diff --git a/impl/src/main/java/org/wamblee/xmlrouter/impl/XMLRouterConfigService.java b/impl/src/main/java/org/wamblee/xmlrouter/impl/XMLRouterConfigService.java index 198855e..a20da62 100644 --- a/impl/src/main/java/org/wamblee/xmlrouter/impl/XMLRouterConfigService.java +++ b/impl/src/main/java/org/wamblee/xmlrouter/impl/XMLRouterConfigService.java @@ -18,12 +18,8 @@ package org.wamblee.xmlrouter.impl; import java.util.concurrent.atomic.AtomicLong; import org.wamblee.xmlrouter.common.Id; -import org.wamblee.xmlrouter.config.Config; -import org.wamblee.xmlrouter.config.ConfigException; import org.wamblee.xmlrouter.config.DocumentType; import org.wamblee.xmlrouter.config.Filter; -import org.wamblee.xmlrouter.config.RouterConfig; -import org.wamblee.xmlrouter.config.RouterConfigService; import org.wamblee.xmlrouter.config.Transformation; /** @@ -45,7 +41,7 @@ public class XMLRouterConfigService implements RouterConfigService { sequence = new AtomicLong(1L); config = aConfig; routerConfigs = new ConfigImpl(RouterConfig.class, - new Id(aApplication)) { + aApplication) { public RouterConfig wrap(final RouterConfig aT) { return new RouterConfig() { @Override @@ -74,8 +70,7 @@ public class XMLRouterConfigService implements RouterConfigService { @Override public RouterConfig emptyConfig(String aId) { - return new SingleRouterConfig(new Id(application + "." + - aId)); + return new SingleRouterConfig(application + "." + aId); } @Override diff --git a/impl/src/main/java/org/wamblee/xmlrouter/impl/XMLRouterConfigurationImpl.java b/impl/src/main/java/org/wamblee/xmlrouter/impl/XMLRouterConfigurationImpl.java index 7a91576..7c570ff 100644 --- a/impl/src/main/java/org/wamblee/xmlrouter/impl/XMLRouterConfigurationImpl.java +++ b/impl/src/main/java/org/wamblee/xmlrouter/impl/XMLRouterConfigurationImpl.java @@ -20,7 +20,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; import org.wamblee.general.Pair; import org.wamblee.xmlrouter.common.Id; -import org.wamblee.xmlrouter.config.RouterConfig; /** * Implements the XML Router configuration interface including the required diff --git a/impl/src/test/java/org/wamblee/xmlrouter/impl/CompositeConfigTest.java b/impl/src/test/java/org/wamblee/xmlrouter/impl/CompositeConfigTest.java index efca721..ad7c1c0 100644 --- a/impl/src/test/java/org/wamblee/xmlrouter/impl/CompositeConfigTest.java +++ b/impl/src/test/java/org/wamblee/xmlrouter/impl/CompositeConfigTest.java @@ -22,8 +22,6 @@ import java.util.List; import org.junit.Test; import org.wamblee.xmlrouter.common.Id; -import org.wamblee.xmlrouter.config.Config; -import org.wamblee.xmlrouter.config.ConfigException; import org.wamblee.xmlrouter.config.Identifiable; public class CompositeConfigTest { @@ -88,14 +86,14 @@ public class CompositeConfigTest { public void testAddConfig() { CompositeConfig composite = composite(); Config c1 = new ConfigImpl( - StringClassInterface.class, id("c1")) { + StringClassInterface.class, "c1") { @Override public Identifiable wrap(Identifiable aT) { return aT; } }; Config c2 = new ConfigImpl( - StringClassInterface.class, id("c2")) { + StringClassInterface.class, "c2") { @Override public Identifiable wrap(Identifiable aT) { return aT; @@ -139,14 +137,14 @@ public class CompositeConfigTest { public void testDuplicatesNotAllowed() { CompositeConfig composite = composite(); Config c1 = new ConfigImpl( - StringClassInterface.class, id("c1")) { + StringClassInterface.class, "c1") { @Override public Identifiable wrap(Identifiable aT) { return aT; } }; Config c2 = new ConfigImpl( - StringClassInterface.class, id("c1")) { + StringClassInterface.class, "c1") { @Override public Identifiable wrap(Identifiable aT) { return aT; @@ -160,14 +158,14 @@ public class CompositeConfigTest { public void testDuplicateItem() { CompositeConfig composite = composite(); Config c1 = new ConfigImpl( - StringClassInterface.class, id("c.x")) { + StringClassInterface.class, "c.x") { @Override public Identifiable wrap(Identifiable aT) { return aT; } }; Config c2 = new ConfigImpl( - StringClassInterface.class, id("c")) { + StringClassInterface.class, "c") { @Override public Identifiable wrap(Identifiable aT) { return aT; diff --git a/impl/src/test/java/org/wamblee/xmlrouter/impl/ConfigImplTest.java b/impl/src/test/java/org/wamblee/xmlrouter/impl/ConfigImplTest.java index 9925c0b..c7b1d9c 100644 --- a/impl/src/test/java/org/wamblee/xmlrouter/impl/ConfigImplTest.java +++ b/impl/src/test/java/org/wamblee/xmlrouter/impl/ConfigImplTest.java @@ -23,7 +23,6 @@ import java.util.concurrent.atomic.AtomicLong; import org.junit.Before; import org.junit.Test; import org.wamblee.xmlrouter.common.Id; -import org.wamblee.xmlrouter.config.Config; import org.wamblee.xmlrouter.config.Identifiable; public class ConfigImplTest { @@ -52,7 +51,7 @@ public class ConfigImplTest { } public static final class MyTypeConfig extends ConfigImpl { - public MyTypeConfig(Id aId) { + public MyTypeConfig(String aId) { super(MyType.class, aId); } @@ -72,7 +71,7 @@ public class ConfigImplTest { @Before public void setUp() { sequence = new AtomicLong(1L); - config = new MyTypeConfig(new Id(CONFIG_TYPE)); + config = new MyTypeConfig(CONFIG_TYPE); } @Test @@ -118,10 +117,10 @@ public class ConfigImplTest { @Test public void testEquals() { - Config config1 = new MyTypeConfig(new Id(CONFIG_TYPE)); + Config config1 = new MyTypeConfig(CONFIG_TYPE); assertFalse(config1.equals(null)); assertFalse(config1.equals("hello")); - Config config2 = new MyTypeConfig(new Id(CONFIG_TYPE)); + Config config2 = new MyTypeConfig(CONFIG_TYPE); assertEquals(config1, config2); assertEquals(config1.hashCode(), config2.hashCode()); @@ -148,7 +147,7 @@ public class ConfigImplTest { testAdd(); assertEquals(2, config.values().size()); MyTypeConfig copy = new MyTypeConfig(config); - assertEquals(config.getId(), config.getId()); + assertEquals(config.getPrefix(), copy.getPrefix()); assertEquals(config, copy); // verify the copy is not shallow diff --git a/impl/src/test/java/org/wamblee/xmlrouter/impl/RobustIdentifiableTest.java b/impl/src/test/java/org/wamblee/xmlrouter/impl/RobustIdentifiableTest.java index 86d55ab..511f583 100644 --- a/impl/src/test/java/org/wamblee/xmlrouter/impl/RobustIdentifiableTest.java +++ b/impl/src/test/java/org/wamblee/xmlrouter/impl/RobustIdentifiableTest.java @@ -21,7 +21,6 @@ import static org.mockito.Mockito.*; import org.junit.Before; import org.junit.Test; import org.wamblee.xmlrouter.common.Id; -import org.wamblee.xmlrouter.config.ConfigException; import org.wamblee.xmlrouter.config.Identifiable; public class RobustIdentifiableTest { diff --git a/impl/src/test/java/org/wamblee/xmlrouter/impl/SingleRouterConfigTest.java b/impl/src/test/java/org/wamblee/xmlrouter/impl/SingleRouterConfigTest.java index 5f151d2..7a71a6c 100644 --- a/impl/src/test/java/org/wamblee/xmlrouter/impl/SingleRouterConfigTest.java +++ b/impl/src/test/java/org/wamblee/xmlrouter/impl/SingleRouterConfigTest.java @@ -23,7 +23,6 @@ import org.junit.Test; import org.wamblee.xmlrouter.common.Id; import org.wamblee.xmlrouter.config.DocumentType; import org.wamblee.xmlrouter.config.Filter; -import org.wamblee.xmlrouter.config.RouterConfig; import org.wamblee.xmlrouter.config.Transformation; public class SingleRouterConfigTest { @@ -32,7 +31,7 @@ public class SingleRouterConfigTest { @Before public void setUp() { - config = new SingleRouterConfig(new Id("routerconfig")); + config = new SingleRouterConfig("routerconfig"); assertEquals("routerconfig", config.getId().getId()); } @@ -87,23 +86,19 @@ public class SingleRouterConfigTest { @Test public void testEqualityEmptyConfig() { - RouterConfig config1 = new SingleRouterConfig(new Id( - "routerconfig")); - RouterConfig config2 = new SingleRouterConfig(new Id( - "routerconfig")); + RouterConfig config1 = new SingleRouterConfig("routerconfig"); + RouterConfig config2 = new SingleRouterConfig("routerconfig"); assertEquals(config1, config2); } @Test public void testEqualsNonEmpty() { - RouterConfig config1 = new SingleRouterConfig(new Id( - "routerconfig")); + RouterConfig config1 = new SingleRouterConfig("routerconfig"); assertFalse(config1.equals(null)); assertFalse(config.equals("hello")); - RouterConfig config2 = new SingleRouterConfig(new Id( - "routerconfig")); + RouterConfig config2 = new SingleRouterConfig("routerconfig"); DocumentType type1 = mock(DocumentType.class); when(type1.getId()).thenReturn(new Id("type1")); DocumentType type2 = mock(DocumentType.class); diff --git a/impl/src/test/java/org/wamblee/xmlrouter/impl/XMLRouterConfigServiceTest.java b/impl/src/test/java/org/wamblee/xmlrouter/impl/XMLRouterConfigServiceTest.java index e56b5c0..9f2f506 100644 --- a/impl/src/test/java/org/wamblee/xmlrouter/impl/XMLRouterConfigServiceTest.java +++ b/impl/src/test/java/org/wamblee/xmlrouter/impl/XMLRouterConfigServiceTest.java @@ -24,10 +24,8 @@ import org.junit.Before; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.wamblee.xmlrouter.common.Id; -import org.wamblee.xmlrouter.config.ConfigException; import org.wamblee.xmlrouter.config.DocumentType; import org.wamblee.xmlrouter.config.Filter; -import org.wamblee.xmlrouter.config.RouterConfig; import org.wamblee.xmlrouter.config.Transformation; public class XMLRouterConfigServiceTest { diff --git a/impl/src/test/java/org/wamblee/xmlrouter/impl/XMLRouterFunctionTest.java b/impl/src/test/java/org/wamblee/xmlrouter/impl/XMLRouterFunctionTest.java index d7c504e..cc66343 100644 --- a/impl/src/test/java/org/wamblee/xmlrouter/impl/XMLRouterFunctionTest.java +++ b/impl/src/test/java/org/wamblee/xmlrouter/impl/XMLRouterFunctionTest.java @@ -29,7 +29,6 @@ import org.junit.Test; import org.wamblee.general.SystemClock; import org.wamblee.xmlrouter.common.Id; import org.wamblee.xmlrouter.config.DocumentType; -import org.wamblee.xmlrouter.config.RouterConfig; import org.wamblee.xmlrouter.config.Transformation; import org.wamblee.xmlrouter.listener.EventInfo; import org.wamblee.xmlrouter.listener.EventListener; diff --git a/impl/src/test/java/org/wamblee/xmlrouter/impl/XMLRouterTest.java b/impl/src/test/java/org/wamblee/xmlrouter/impl/XMLRouterTest.java index c4375c7..c6b1aa0 100644 --- a/impl/src/test/java/org/wamblee/xmlrouter/impl/XMLRouterTest.java +++ b/impl/src/test/java/org/wamblee/xmlrouter/impl/XMLRouterTest.java @@ -33,7 +33,6 @@ import org.wamblee.general.SystemClock; import org.wamblee.xmlrouter.common.Id; import org.wamblee.xmlrouter.config.DocumentType; import org.wamblee.xmlrouter.config.Filter; -import org.wamblee.xmlrouter.config.RouterConfig; import org.wamblee.xmlrouter.config.Transformation; import org.wamblee.xmlrouter.listener.EventInfo; import org.wamblee.xmlrouter.listener.EventListener; @@ -86,8 +85,7 @@ public class XMLRouterTest { Logger logger = Logger.getLogger(XMLRouter.class.getName()); setLogLevel(logger, Level.FINEST); - routerConfig = new SingleRouterConfig(new Id( - "routerconfig")); + routerConfig = new SingleRouterConfig("routerconfig"); config = new XMLRouterConfigurationImpl(routerConfig); EventListener logListener = new LoggingEventListener(Level.INFO); listener = spy(logListener); -- 2.31.1