git://wamblee.org
/
xmlrouter
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed the prefix argument from ConfigImpl.wrap().
[xmlrouter]
/
impl
/
src
/
main
/
java
/
org
/
wamblee
/
xmlrouter
/
impl
/
RobustIdentifiable.java
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 f3da5f401e98f0dd7ae252c8c04458c781a51ad9..2e63a9799901f2616e6fdc6fc1438c80adf570a1 100644
(file)
--- a/
impl/src/main/java/org/wamblee/xmlrouter/impl/RobustIdentifiable.java
+++ b/
impl/src/main/java/org/wamblee/xmlrouter/impl/RobustIdentifiable.java
@@
-15,14
+15,18
@@
*/
package org.wamblee.xmlrouter.impl;
*/
package org.wamblee.xmlrouter.impl;
+import static org.wamblee.xmlrouter.impl.MessageUtil.*;
+
import java.util.logging.Level;
import java.util.logging.Logger;
import org.wamblee.xmlrouter.common.Id;
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;
/**
import org.wamblee.xmlrouter.config.Identifiable;
/**
- * Robust identifiable provides robustness for identifiable objects.
+ * Robust identifiable provides robustness for identifiable objects. It adds
+ * equality based on the id.
*
* @author Erik Brakkee
*
*
* @author Erik Brakkee
*
@@
-34,33
+38,29
@@
public class RobustIdentifiable<T> implements Identifiable<T> {
private Id<T> id;
private Id<T> id;
- // TODO test this class.
- // TODO test that id is constant even though delegated changes its id.
-
public RobustIdentifiable(Identifiable<T> aIdentifiable) {
public RobustIdentifiable(Identifiable<T> aIdentifiable) {
- // TODO test id is null
- // TODO getId() throws exception
+ notNull("identifiable", aIdentifiable);
try {
id = aIdentifiable.getId();
if (id == null) {
try {
id = aIdentifiable.getId();
if (id == null) {
- id = new Id<T>(Constants.UNKNOWN_ID.toString());
- throw new RuntimeException(
- "Temporary to catch nulls during refactoring");
+ throwConfigException("identifiable.getId() returned null", null);
}
} catch (Exception e) {
}
} catch (Exception e) {
- LOGGER
- .log(Level.WARNING, "Identifiable getId() threw exception", e);
+ throwConfigException("identifiable.getId() threw exception", e);
}
}
}
}
+ private void throwConfigException(String aMsg, Exception aException) {
+ LOGGER.log(Level.WARNING, aMsg, aException);
+ throw new ConfigException(aMsg);
+ }
+
@Override
public Id<T> getId() {
return id;
}
@Override
public Id<T> getId() {
return id;
}
- // TODO test equals, hashcode.
-
@Override
public int hashCode() {
return id.hashCode();
@Override
public int hashCode() {
return id.hashCode();