* @param <T>
* Type for which ids are generated.
*/
-public interface Config<T> extends Identifiable<Config> {
-
- // TODO define what happens when there is a duplicate item.
-
+public interface Config<T extends Identifiable> extends Identifiable<Config> {
/**
* Adds an item. No item with the same id may exist.
*
* @param aT
* item
+ * @throws DuplicateException
+ * In case an object with the same id already exists.
*/
void add(T aT);
--- /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.config;
+
+/**
+ * Exception thrown in case of duplicates.
+ *
+ * @author Erik Brakkee
+ */
+public class DuplicateException extends RuntimeException {
+
+ public DuplicateException(String aMsg) {
+ super(aMsg);
+ }
+
+ public DuplicateException(String aMsg, Throwable aCause) {
+ super(aMsg, aCause);
+ }
+}
*/
package org.wamblee.xmlrouter.impl;
+import static org.wamblee.xmlrouter.impl.MessageUtil.*;
+
import java.util.ArrayList;
+import java.util.HashSet;
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.DuplicateException;
+import org.wamblee.xmlrouter.config.Identifiable;
/**
* Composite config. The composite config
*
* @param <T>
*/
-public class CompositeConfig<T> implements ExtendedConfig<T> {
+public class CompositeConfig<T extends Identifiable<T>> implements
+ ExtendedConfig<T> {
+ private static final String READ_ONLY_INSTANCE = "read only instance";
+ private Set<Id<Config>> ids;
private Id<Config> id;
- private List<T> configs;
+ private List<Id<T>> valueIds;
+ private List<T> values;
public CompositeConfig(Id<Config> aId) {
+ ids = new HashSet<Id<Config>>();
id = aId;
- configs = new ArrayList<T>();
+ valueIds = new ArrayList<Id<T>>();
+ values = new ArrayList<T>();
}
@Override
public Id<Config> getId() {
- // TODO test id.
return id;
}
- public void add(Config<T> aConfig) {
- // TODO check duplicate config.
+ public void addConfig(Config<T> aConfig) {
+ if (ids.contains(aConfig.getId())) {
+ throw new DuplicateException(aConfig.getId().toString());
+ }
for (T item : aConfig.values()) {
- configs.add(item);
+ if (valueIds.contains(item.getId())) {
+ throw new DuplicateException(item.getId().toString());
+ }
+ }
+
+ ids.add(aConfig.getId());
+ for (T item : aConfig.values()) {
+ valueIds.add(item.getId());
+ values.add(item);
}
}
@Override
public List<T> values() {
- return configs;
+ return values;
}
@Override
public boolean remove(Id<T> aId) {
- notSupported();
+ notSupported(READ_ONLY_INSTANCE);
return false;
}
@Override
public void add(T aT) {
- notSupported();
- }
-
- private void notSupported() {
- throw new RuntimeException("readonly instance");
+ notSupported(READ_ONLY_INSTANCE);
}
}
"transformations"));
filters = new CompositeConfig<Filter>(new Id<Config>("filters"));
for (RouterConfig config : aConfigs) {
- documentTypes.add(config.documentTypeConfig());
- transformations.add(config.transformationConfig());
- filters.add(config.filterConfig());
+ documentTypes.addConfig(config.documentTypeConfig());
+ transformations.addConfig(config.transformationConfig());
+ filters.addConfig(config.filterConfig());
}
}
*/
package org.wamblee.xmlrouter.impl;
+import static org.wamblee.xmlrouter.impl.MessageUtil.*;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
*/
// TODO make sure that each item inside this config is prefixed with the id of
// the config.
-public abstract class ConfigImpl<T extends Identifiable> implements
+public abstract class ConfigImpl<T extends Identifiable<T>> implements
ExtendedConfig<T> {
private Id<Config> id;
*/
@Override
public synchronized void add(T aT) {
- // TODO test duplicate ids.
- notNull(aT);
+ notNull("aT", aT);
registered.add(wrap(id.getId() + ".", aT));
}
*/
@Override
public synchronized boolean remove(Id<T> aId) {
- notNull(aId);
+ notNull("aId", aId);
Iterator<T> i = registered.iterator();
while (i.hasNext()) {
T t = i.next();
public List<T> values() {
return Collections.unmodifiableList(registered);
}
-
- private void notNull(T aT) {
- if (aT == null) {
- throw new NullPointerException("Object is null");
- }
- }
-
- private void notNull(Id<T> aId) {
- if (aId == null) {
- throw new NullPointerException("Id is null");
- }
- }
}
package org.wamblee.xmlrouter.impl;
import org.wamblee.xmlrouter.config.Config;
+import org.wamblee.xmlrouter.config.Identifiable;
-public interface ExtendedConfig<T> extends Config<T> {
+public interface ExtendedConfig<T extends Identifiable<T>> extends Config<T> {
}
--- /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;
+
+/**
+ * Some simple utilities for checking values and guarding unsupported methods.
+ *
+ * @author Erik Brakkee
+ */
+public class MessageUtil {
+
+ public static void notSupported(String aMessage) {
+ throw new RuntimeException(aMessage);
+ }
+
+ public static void notNull(String aName, Object aValue) {
+ if (aValue == null) {
+ throw new IllegalArgumentException("Parameter '" + aName +
+ "' may not be null");
+ }
+ }
+}
import org.wamblee.xmlrouter.config.Transformation;
// TODO implement equality based on ids for the single routerconfig.
-// TODO add clear method to the routerconfig
// TODO implement copying of routerconfig.
/**
--- /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 java.util.List;
+
+import org.junit.Test;
+import org.wamblee.xmlrouter.common.Id;
+import org.wamblee.xmlrouter.config.Config;
+import org.wamblee.xmlrouter.config.DuplicateException;
+import org.wamblee.xmlrouter.config.Identifiable;
+
+public class CompositeConfigTest {
+
+ public static class IntClass implements Identifiable<IntClass> {
+
+ private int value;
+
+ public IntClass(int aValue) {
+ value = aValue;
+ }
+
+ @Override
+ public Id<IntClass> getId() {
+ return new Id<IntClass>(value + "");
+ }
+
+ @Override
+ public int hashCode() {
+ return ((Integer) value).hashCode();
+ }
+
+ @Override
+ public boolean equals(Object aObj) {
+ if (aObj == null) {
+ return false;
+ }
+ if (!(aObj instanceof IntClass)) {
+ return false;
+ }
+ IntClass obj = (IntClass) aObj;
+ return value == obj.value;
+ }
+ }
+
+ @Test
+ public void testEmptyConfig() {
+ Config<IntClass> composite = composite("c");
+ assertEquals(id("c"), composite.getId());
+ assertTrue(composite.values().isEmpty());
+ }
+
+ @Test(expected = RuntimeException.class)
+ public void testAddNotAllowed() {
+ composite("c").add(new IntClass(10));
+ }
+
+ @Test(expected = RuntimeException.class)
+ public void testRemoveNotAllowed() {
+ composite("c").remove(new Id<IntClass>("xxx"));
+ }
+
+ @Test
+ public void testAddConfig() {
+ CompositeConfig<IntClass> composite = composite("c");
+ Config<IntClass> c1 = new ConfigImpl(id("c1")) {
+ @Override
+ public Identifiable wrap(String aPrefix, Identifiable aT) {
+ return aT;
+ }
+ };
+ Config<IntClass> c2 = new ConfigImpl(id("c2")) {
+ @Override
+ public Identifiable wrap(String aPrefix, Identifiable aT) {
+ return aT;
+ }
+ };
+
+ IntClass i1 = new IntClass(10);
+ IntClass i2 = new IntClass(20);
+ IntClass i3 = new IntClass(30);
+ IntClass i4 = new IntClass(40);
+
+ c1.add(i1);
+ c1.add(i2);
+ c2.add(i3);
+ c2.add(i4);
+
+ composite.addConfig(c1);
+ List<IntClass> values = composite.values();
+ assertEquals(2, values.size());
+ assertTrue(values.contains(i1));
+ assertTrue(values.contains(i2));
+
+ composite.addConfig(c2);
+ values = composite.values();
+ assertEquals(4, values.size());
+ assertTrue(values.contains(i1));
+ assertTrue(values.contains(i2));
+ assertTrue(values.contains(i3));
+ assertTrue(values.contains(i4));
+ }
+
+ @Test(expected = DuplicateException.class)
+ public void testDuplicatesNotAllowed() {
+ CompositeConfig<IntClass> composite = composite("c");
+ Config<IntClass> c1 = new ConfigImpl(id("c1")) {
+ @Override
+ public Identifiable wrap(String aPrefix, Identifiable aT) {
+ return aT;
+ }
+ };
+ Config<IntClass> c2 = new ConfigImpl(id("c1")) {
+ @Override
+ public Identifiable wrap(String aPrefix, Identifiable aT) {
+ return aT;
+ }
+ };
+ composite.addConfig(c1);
+ composite.addConfig(c2);
+ }
+
+ @Test
+ public void testDuplicateItem() {
+ CompositeConfig<IntClass> composite = composite("c");
+ Config<IntClass> c1 = new ConfigImpl(id("c1")) {
+ @Override
+ public Identifiable wrap(String aPrefix, Identifiable aT) {
+ return aT;
+ }
+ };
+ Config<IntClass> c2 = new ConfigImpl(id("c2")) {
+ @Override
+ public Identifiable wrap(String aPrefix, Identifiable aT) {
+ return aT;
+ }
+ };
+
+ IntClass i1 = new IntClass(10);
+ IntClass i2 = new IntClass(10);
+ c1.add(i1);
+ c2.add(i2);
+ composite.addConfig(c1);
+ try {
+ composite.addConfig(c2);
+ fail();
+ } catch (DuplicateException e) {
+ // ok.
+ }
+ assertEquals(1, composite.values().size());
+ assertTrue(composite.values().contains(i1));
+ }
+
+ private CompositeConfig<IntClass> composite(String aId) {
+ return new CompositeConfig<IntClass>(id(aId));
+ }
+
+ private Id<Config> id(String aId) {
+ return new Id<Config>(aId);
+ }
+}
private static final String CONFIG_TYPE = "transformation";
- private static interface MyType extends Identifiable {
+ private static interface MyType extends Identifiable<MyType> {
}
git://wamblee.org / xmlrouter / commitdiff