/**
* Constructs a router configuration.
*
- * @param aSequenceNumberGenerator
- * Sequence number generator to use.
+ * @param aId
+ * Unique id for this configuration.
*/
public SingleRouterConfig(Id<RouterConfig> aId) {
id = aId;
documentTypes = new ConfigImpl<DocumentType>(new Id<Config>(
- "documentTypes")) {
+ aId.getId() + ".documenttypes")) {
@Override
public DocumentType wrap(String aPrefix, DocumentType aT) {
return new RobustDocumentType(aPrefix, aT);
}
};
transformations = new ConfigImpl<Transformation>(new Id<Config>(
- "transformations")) {
+ aId.getId() + ".transformations")) {
@Override
public Transformation wrap(String aPrefix,
Transformation aTransformation) {
return new RobustTransformation(aPrefix, aTransformation);
}
};
- filters = new ConfigImpl<Filter>(new Id<Config>("filters")) {
+ filters = new ConfigImpl<Filter>(new Id<Config>(aId.getId() +
+ ".filters")) {
@Override
public Filter wrap(String aPrefix, Filter aFilter) {
return new RobustFilter(aPrefix, aFilter);
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;
// TODO pass unique id of config service in the constructor to allow multiple instances with
// unique ids (ServiceFactory)
*/
public class XMLRouterConfigService implements RouterConfigService {
+ private String application;
private AtomicLong sequence;
private XMLRouterConfiguration config;
private Config<RouterConfig> routerConfigs;
- public XMLRouterConfigService(XMLRouterConfiguration aConfig) {
+ public XMLRouterConfigService(String aApplication,
+ XMLRouterConfiguration aConfig) {
+ application = aApplication;
sequence = new AtomicLong(1L);
config = aConfig;
- routerConfigs = new ConfigImpl<RouterConfig>(new Id<Config>("config")) {
- public RouterConfig wrap(String aPrefix, RouterConfig aT) {
- return aT;
+ routerConfigs = new ConfigImpl<RouterConfig>(new Id<Config>(
+ aApplication)) {
+ public RouterConfig wrap(final String aPrefix, final RouterConfig aT) {
+ return new RouterConfig() {
+ @Override
+ public Id<RouterConfig> getId() {
+ return new Id<RouterConfig>(aT.getId().toString());
+ }
+
+ @Override
+ public Config<DocumentType> documentTypeConfig() {
+ return aT.documentTypeConfig();
+ }
+
+ @Override
+ public Config<Filter> filterConfig() {
+ return aT.filterConfig();
+ }
+
+ @Override
+ public Config<Transformation> transformationConfig() {
+ return aT.transformationConfig();
+ }
+ };
}
};
}
@Override
public RouterConfig emptyConfig(String aId) {
- // TODO check AP{ impacts.
- return new SingleRouterConfig(new Id<RouterConfig>(aId));
+ return new SingleRouterConfig(new Id<RouterConfig>(application + "." +
+ aId));
}
@Override
public void apply(RouterConfig aConfig, Id<RouterConfig> aOldConfig) {
if (aOldConfig != null) {
- routerConfigs.remove(aOldConfig);
+ if (!routerConfigs.remove(new Id<RouterConfig>(application + "." +
+ aOldConfig.getId()))) {
+ throw new ConfigException("Unknown routerconfig '" +
+ aOldConfig + "'");
+ }
}
routerConfigs.add(aConfig);
update();
new Id<RouterConfig>("routerconfig"), routerConfigs.values());
config.setRouterConfig(newconfig);
}
-
}
--- /dev/null
+/*
+ * 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.impl;
+
+import static junit.framework.Assert.*;
+import static org.mockito.Mockito.*;
+
+import java.util.List;
+
+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 {
+
+ private XMLRouterConfiguration config;
+ private ArgumentCaptor<ExtendedRouterConfig> captor;
+ private XMLRouterConfigService svc;
+
+ @Before
+ public void setUp() {
+ config = mock(XMLRouterConfiguration.class);
+ captor = ArgumentCaptor.forClass(ExtendedRouterConfig.class);
+ svc = new XMLRouterConfigService("myapp", config);
+ }
+
+ @Test
+ public void testPrefixingOfConfigItems() {
+ RouterConfig routerConfig = createRouterConfig("id", "");
+
+ svc.apply(routerConfig, null);
+
+ verifyResults("");
+ }
+
+ private void verifyResults(String aSuffix) {
+ verify(config).setRouterConfig(captor.capture());
+ RouterConfig received = captor.getValue();
+
+ List<DocumentType> docTypes = received.documentTypeConfig().values();
+ assertEquals(1, docTypes.size());
+ assertEquals("myapp.id.documenttypes.doctype" + aSuffix, docTypes
+ .get(0).getId().toString());
+
+ List<Transformation> transformations = received.transformationConfig()
+ .values();
+ assertEquals(1, transformations.size());
+ assertEquals("myapp.id.transformations.t1" + aSuffix, transformations
+ .get(0).getId().toString());
+
+ List<Filter> filters = received.filterConfig().values();
+ assertEquals(1, filters.size());
+ assertEquals("myapp.id.filters.f1" + aSuffix, filters.get(0).getId()
+ .toString());
+ }
+
+ private RouterConfig createRouterConfig(String routerConfigId,
+ String aSuffix) {
+ RouterConfig routerConfig = svc.emptyConfig(routerConfigId);
+
+ DocumentType type = mock(DocumentType.class);
+ when(type.getName()).thenReturn("doctype" + aSuffix);
+ when(type.getId())
+ .thenReturn(new Id<DocumentType>("doctype" + aSuffix));
+
+ Transformation trans = mock(Transformation.class);
+ when(trans.getId()).thenReturn(new Id<Transformation>("t1" + aSuffix));
+
+ Filter filter = mock(Filter.class);
+ when(filter.getId()).thenReturn(new Id<Filter>("f1" + aSuffix));
+
+ routerConfig.documentTypeConfig().add(type);
+ routerConfig.transformationConfig().add(trans);
+ routerConfig.filterConfig().add(filter);
+ return routerConfig;
+ }
+
+ @Test(expected = ConfigException.class)
+ public void testReplaceWithoutIndicatingOldConfig() {
+ RouterConfig routerConfig1 = createRouterConfig("id", "");
+
+ svc.apply(routerConfig1, null);
+ RouterConfig routerConfig2 = createRouterConfig("id", "");
+
+ svc.apply(routerConfig2, null);
+ }
+
+ @Test
+ public void testReplaceCorrectly() {
+ RouterConfig routerConfig1 = createRouterConfig("id", "");
+
+ svc.apply(routerConfig1, null);
+ RouterConfig routerConfig2 = createRouterConfig("id", "suffix");
+
+ reset(config);
+ svc.apply(routerConfig2, new Id<RouterConfig>("id"));
+
+ verifyResults("suffix");
+ }
+
+}
git://wamblee.org / xmlrouter / commitdiff