Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Warn about ignored attributes in configuration. #186

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Warn about ignored attributes in configuration. #186

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions src/main/java/no/priv/garshol/duke/ConfigLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
* Can read XML configuration files and return a fully set up configuration.
*/
public class ConfigLoader {
private static Logger logger = new DummyLogger();

/**
* Note that if file starts with 'classpath:' the resource is looked
Expand Down Expand Up @@ -117,6 +118,19 @@ private ConfigHandler(ConfigurationImpl config, String path) {
keepers.add("comparator");
}

private void checkAttributes(String localName, Attributes attributes, String... usedAttributes) {
Set<String> attrSet = new HashSet<String>();
for (int i = 0 ; i < attributes.getLength() ; i++) {
attrSet.add(attributes.getLocalName(i));
}
for (String attr : usedAttributes) {
attrSet.remove(attr);
}
if (!attrSet.isEmpty()) {
logger.warn("The following attributes of <"+ localName +"> are ignored: " + attrSet);
}
}

public void startElement(String uri, String localName, String qName,
Attributes attributes) {
if (keepers.contains(localName)) {
Expand All @@ -134,24 +148,32 @@ public void startElement(String uri, String localName, String qName,
lookup = (Property.Lookup) ObjectUtils.getEnumConstantByName(
Property.Lookup.class,
attributes.getValue("lookup").toUpperCase());

checkAttributes("property" ,attributes, "type", "lookup");
} else if (localName.equals("csv")) {
datasource = new CSVDataSource();
currentobj = datasource;
checkAttributes("csv", attributes);
} else if (localName.equals("jdbc")) {
datasource = new JDBCDataSource();
currentobj = datasource;
checkAttributes("jdbc", attributes);
} else if (localName.equals("jndi")) {
datasource = new JNDIDataSource();
currentobj = datasource;
checkAttributes("jndi", attributes);
} else if (localName.equals("sparql")) {
datasource = new SparqlDataSource();
currentobj = datasource;
checkAttributes("sparql", attributes);
} else if (localName.equals("ntriples")) {
datasource = new NTriplesDataSource();
currentobj = datasource;
checkAttributes("ntriples", attributes);
} else if (localName.equals("data-source")) {
datasource = (DataSource) instantiate(attributes.getValue("class"));
currentobj = datasource;
checkAttributes("data-source", attributes);
} else if (localName.equals("column")) {
if (!(datasource instanceof ColumnarDataSource))
throw new DukeConfigException("Column inside data source which " +
Expand All @@ -171,6 +193,7 @@ public void startElement(String uri, String localName, String qName,
c.setSplitOn(spliton);

((ColumnarDataSource) datasource).addColumn(c);
checkAttributes("column", attributes, "name", "property", "prefix", "cleaner", "split-on");
} else if (localName.equals("param")) {
String param = attributes.getValue("name");
String value = attributes.getValue("value");
Expand All @@ -185,6 +208,8 @@ public void startElement(String uri, String localName, String qName,
value = new File(path, value).getAbsolutePath();

ObjectUtils.setBeanProperty(currentobj, param, value, objects);

checkAttributes("param", attributes, "name", "value");
} else if (localName.equals("group")) {
groupno++;
// FIXME: now possible to have data sources between the two
Expand All @@ -196,17 +221,20 @@ else if (groupno == 3)
throw new DukeConfigException("Record linkage mode only supports " +
"two groups");

checkAttributes("param", attributes);
} else if (localName.equals("object")) {
String klass = attributes.getValue("class");
String name = attributes.getValue("name");
currentobj = instantiate(klass);
objects.put(name, currentobj);
checkAttributes("param", attributes, "name", "class");
} else if (localName.equals("database")) {
String klass = attributes.getValue("class");
if (klass == null)
klass = "no.priv.garshol.duke.LuceneDatabase"; // default
database = (Database) instantiate(klass);
currentobj = database;
checkAttributes("param", attributes, "class");
}
}

Expand Down Expand Up @@ -305,4 +333,12 @@ private static Object instantiate(String classname) {
": " + e);
}
}

/**
* Sets the logger to report to.
*/
public static void setLogger(Logger logger_) {
logger = logger_;
}

}