Author: tommaso
Date: Thu May 17 20:31:31 2012
New Revision: 1339849
URL: http://svn.apache.org/viewvc?rev=1339849&view=rev
Log:
[CLEREZZA-695] - fixing logging, removing stacktraces, fixing member access
level
Modified:
incubator/clerezza/trunk/parent/uima/uima.casconsumer/src/main/java/org/apache/clerezza/uima/casconsumer/CASMappingStrategy.java
incubator/clerezza/trunk/parent/uima/uima.casconsumer/src/main/java/org/apache/clerezza/uima/casconsumer/ClerezzaCASConsumer.java
incubator/clerezza/trunk/parent/uima/uima.casconsumer/src/main/java/org/apache/clerezza/uima/casconsumer/ao/AOMappingStrategy.java
incubator/clerezza/trunk/parent/uima/uima.casconsumer/src/main/java/org/apache/clerezza/uima/casconsumer/ao/SelectorRegistry.java
incubator/clerezza/trunk/parent/uima/uima.casconsumer/src/test/java/org/apache/clerezza/uima/casconsumer/ClerezzaCASConsumerTest.java
incubator/clerezza/trunk/parent/uima/uima.casconsumer/src/test/java/org/apache/clerezza/uima/casconsumer/ao/AnnotationOntologyCASConsumerTest.java
Modified:
incubator/clerezza/trunk/parent/uima/uima.casconsumer/src/main/java/org/apache/clerezza/uima/casconsumer/CASMappingStrategy.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/uima/uima.casconsumer/src/main/java/org/apache/clerezza/uima/casconsumer/CASMappingStrategy.java?rev=1339849&r1=1339848&r2=1339849&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/uima/uima.casconsumer/src/main/java/org/apache/clerezza/uima/casconsumer/CASMappingStrategy.java
(original)
+++
incubator/clerezza/trunk/parent/uima/uima.casconsumer/src/main/java/org/apache/clerezza/uima/casconsumer/CASMappingStrategy.java
Thu May 17 20:31:31 2012
@@ -27,9 +27,10 @@ public interface CASMappingStrategy {
/**
* Converts a {@link CAS} object to an RDF object
- * @param cas the {@link CAS} object to convert
+ *
+ * @param cas the {@link CAS} object to convert
* @param graphName the name of the graph to be created
* @throws CASMappingException
*/
- void map(CAS cas, String graphName) throws CASMappingException;
+ public void map(CAS cas, String graphName) throws CASMappingException;
}
Modified:
incubator/clerezza/trunk/parent/uima/uima.casconsumer/src/main/java/org/apache/clerezza/uima/casconsumer/ClerezzaCASConsumer.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/uima/uima.casconsumer/src/main/java/org/apache/clerezza/uima/casconsumer/ClerezzaCASConsumer.java?rev=1339849&r1=1339848&r2=1339849&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/uima/uima.casconsumer/src/main/java/org/apache/clerezza/uima/casconsumer/ClerezzaCASConsumer.java
(original)
+++
incubator/clerezza/trunk/parent/uima/uima.casconsumer/src/main/java/org/apache/clerezza/uima/casconsumer/ClerezzaCASConsumer.java
Thu May 17 20:31:31 2012
@@ -30,6 +30,9 @@ import org.apache.uima.resource.Resource
*/
public class ClerezzaCASConsumer extends CasAnnotator_ImplBase {
+ private static final String MAPPING_STRATEGY = "mappingStrategy";
+ private static final String GRAPH_NAME = "graphName";
+
private String graphName;
private CASMappingStrategy mappingStrategy;
@@ -40,13 +43,13 @@ public class ClerezzaCASConsumer extends
// get the CAS mapping strategy
try {
mappingStrategy =
CASMappingStrategiesRepository.getInstance().getStrategy(String.valueOf(context.
- getConfigParameterValue("mappingStrategy")));
+ getConfigParameterValue(MAPPING_STRATEGY)));
} catch (UnknownStrategyException e) {
throw new ResourceInitializationException(e);
}
// get the output graph name
- graphName = String.valueOf(context.getConfigParameterValue("graphName"));
+ graphName = String.valueOf(context.getConfigParameterValue(GRAPH_NAME));
}
@Override
Modified:
incubator/clerezza/trunk/parent/uima/uima.casconsumer/src/main/java/org/apache/clerezza/uima/casconsumer/ao/AOMappingStrategy.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/uima/uima.casconsumer/src/main/java/org/apache/clerezza/uima/casconsumer/ao/AOMappingStrategy.java?rev=1339849&r1=1339848&r2=1339849&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/uima/uima.casconsumer/src/main/java/org/apache/clerezza/uima/casconsumer/ao/AOMappingStrategy.java
(original)
+++
incubator/clerezza/trunk/parent/uima/uima.casconsumer/src/main/java/org/apache/clerezza/uima/casconsumer/ao/AOMappingStrategy.java
Thu May 17 20:31:31 2012
@@ -18,11 +18,6 @@
*/
package org.apache.clerezza.uima.casconsumer.ao;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.concurrent.locks.Lock;
-
import org.apache.clerezza.rdf.core.BNode;
import org.apache.clerezza.rdf.core.Triple;
import org.apache.clerezza.rdf.core.TripleCollection;
@@ -41,6 +36,11 @@ import org.apache.uima.jcas.tcas.Annotat
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.concurrent.locks.Lock;
+
/**
* {@link CASMappingStrategy} which maps a CAS object to the Annotation
Ontology format
*/
@@ -69,29 +69,31 @@ public class AOMappingStrategy implement
int annotCnt = 0;
for (FeatureStructure uimaObject : UIMAUtils.getAllFSofType(TOP.type,
cas.getJCas())) {
- // set Annotation specific properties for the node
- if (uimaObject instanceof Annotation) {
- // If type is DocumentAnnotation I skip it
- if
(uimaObject.getType().toString().equals("uima.tcas.DocumentAnnotation")) {
- continue;
- }
-
- // Get persistent URI for region in document
- Annotation annot = (Annotation) uimaObject;
- log.info("annotation index " + annotCnt);
- annotIndex.put(annot, annotCnt);
- annotCnt++;
+ // set Annotation specific properties for the node
+ if (uimaObject instanceof Annotation) {
+ // If type is DocumentAnnotation I skip it
+ if
(uimaObject.getType().toString().equals("uima.tcas.DocumentAnnotation")) {
+ continue;
}
+
+ // Get persistent URI for region in document
+ Annotation annot = (Annotation) uimaObject;
+ log.info("annotation index " + annotCnt);
+ annotIndex.put(annot, annotCnt);
+ annotCnt++;
+ }
}
UriRef annotationSetUri = new UriRef(
- new
StringBuilder(AO.AnnotationSet.getUnicodeString()).toString());
- log.info("AO: Annotation set uri " + annotationSetUri);
+ new StringBuilder(AO.AnnotationSet.getUnicodeString()).toString());
+ if (log.isDebugEnabled())
+ log.debug(new StringBuilder("AO: Annotation set uri
").append(annotationSetUri).toString());
GraphNode annotationSet = new GraphNode(annotationSetUri,
node.getGraph());
- log.info(new StringBuilder("AO: Set created ").toString());
+ if (log.isDebugEnabled())
+ log.debug(new StringBuilder("AO: Set created ").toString());
annotationSet.addProperty(new
UriRef("http://www.w3.org/1999/02/22-rdf-syntax-ns#type";),
- AO.AnnotationSet);
+ AO.AnnotationSet);
for (FeatureStructure uimaObject : UIMAUtils.getAllFSofType(TOP.type,
cas.getJCas())) {
@@ -110,15 +112,17 @@ public class AOMappingStrategy implement
// Annotation URI
int annotId = annotIndex.get((Annotation) uimaObject);
UriRef annotationUri = new UriRef(new
StringBuilder(AO.Annotation.getUnicodeString())
- .append("/").append(annotId).toString());
- log.info("annotation uri " + annotationUri);
+ .append("/").append(annotId).toString());
+ if (log.isDebugEnabled())
+ log.debug(new StringBuilder("annotation uri
").append(annotationUri).toString());
// Annotation Graph
GraphNode annotationNode = new GraphNode(annotationUri,
annotationSet.getGraph());
- log.info(new StringBuilder("AO: Node created for Type ").append(
- uimaObject.getType().toString()).toString());
+ if (log.isDebugEnabled())
+ log.debug(new StringBuilder("AO: Node created for Type ").append(
+ uimaObject.getType().toString()).toString());
annotationNode.addProperty(new
UriRef("http://www.w3.org/1999/02/22-rdf-syntax-ns#type";),
- new UriRef("http://purl.org/ao/Annotation";));
+ new UriRef("http://purl.org/ao/Annotation";));
annotationNode.addProperty(AO.context, selectorUri);
@@ -137,27 +141,30 @@ public class AOMappingStrategy implement
// create a new feature node
GraphNode selectorNode = new GraphNode(selectorUri, node.getGraph());
- log.info(new StringBuilder("Node created for Selector " +
selectorUri).toString());
+ if (log.isDebugEnabled())
+ log.debug(new StringBuilder("Node created for Selector
").append(selectorUri).toString());
String documentText = cas.getDocumentText();
selectorNode.addProperty(new
UriRef("http://www.w3.org/1999/02/22-rdf-syntax-ns#type";),
- AO.Selector);
+ AO.Selector);
selectorNode.addProperty(new
UriRef("http://www.w3.org/1999/02/22-rdf-syntax-ns#type";),
- AOSELECTORS.OffsetRangeTextSelector);
+ AOSELECTORS.OffsetRangeTextSelector);
selectorNode.addProperty(new
UriRef("http://www.w3.org/1999/02/22-rdf-syntax-ns#type";),
- AOSELECTORS.PrefixPostfixTextSelector);
+ AOSELECTORS.PrefixPostfixTextSelector);
selectorNode.addPropertyValue(AOSELECTORS.exact, getSpan(documentText,
sel.start, sel.end));
selectorNode.addPropertyValue(AOSELECTORS.prefix,
- getSpan(documentText, sel.start - 50, sel.start));
+ getSpan(documentText, sel.start - 50, sel.start));
selectorNode.addPropertyValue(AOSELECTORS.postfix,
- getSpan(documentText, sel.end, sel.end + 50));
+ getSpan(documentText, sel.end, sel.end + 50));
selectorNode.addPropertyValue(AOSELECTORS.offset, sel.start);
selectorNode.addPropertyValue(AOSELECTORS.range, sel.end);
}
- TripleCollection tc = node.getGraph();
- for (Triple t : tc) {
- log.info(t.toString());
+ if (log.isDebugEnabled()) {
+ TripleCollection tc = node.getGraph();
+ for (Triple t : tc) {
+ log.debug(t.toString());
+ }
}
Modified:
incubator/clerezza/trunk/parent/uima/uima.casconsumer/src/main/java/org/apache/clerezza/uima/casconsumer/ao/SelectorRegistry.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/uima/uima.casconsumer/src/main/java/org/apache/clerezza/uima/casconsumer/ao/SelectorRegistry.java?rev=1339849&r1=1339848&r2=1339849&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/uima/uima.casconsumer/src/main/java/org/apache/clerezza/uima/casconsumer/ao/SelectorRegistry.java
(original)
+++
incubator/clerezza/trunk/parent/uima/uima.casconsumer/src/main/java/org/apache/clerezza/uima/casconsumer/ao/SelectorRegistry.java
Thu May 17 20:31:31 2012
@@ -25,44 +25,45 @@ import java.util.HashMap;
import java.util.Iterator;
public class SelectorRegistry {
- public class Selector {
- public final UriRef uri;
- public final int start;
- public final int end;
-
- public Selector(UriRef uri, int start, int end) {
- this.uri=uri;
- this.start = start;
- this.end = end;
- }
-
- }
- private HashMap<String,Selector> registry;
- private int count;
-
- public SelectorRegistry() {
- registry=new HashMap<String, Selector>();
- count=1;
- }
-
- public UriRef get(int start, int end) {
- String key = start+":"+end;
- Selector sel = registry.get(key);
- if(sel==null) {
- UriRef uri= new UriRef(new
StringBuilder(AO.Selector.getUnicodeString()).
- append("/").append(count++).toString());
-
- sel=new Selector(uri,start,end);
- registry.put(key,sel);
- }
- return sel.uri;
- }
-
- public Iterator<Selector> iterator() {
- return registry.values().iterator();
- }
-
- public int getSize() {
- return registry.size();
- }
+ public class Selector {
+ public final UriRef uri;
+ public final int start;
+ public final int end;
+
+ public Selector(UriRef uri, int start, int end) {
+ this.uri = uri;
+ this.start = start;
+ this.end = end;
+ }
+
+ }
+
+ private HashMap<String, Selector> registry;
+ private int count;
+
+ public SelectorRegistry() {
+ registry = new HashMap<String, Selector>();
+ count = 1;
+ }
+
+ public UriRef get(int start, int end) {
+ String key = start + ":" + end;
+ Selector sel = registry.get(key);
+ if (sel == null) {
+ UriRef uri = new UriRef(new
StringBuilder(AO.Selector.getUnicodeString()).
+ append("/").append(count++).toString());
+
+ sel = new Selector(uri, start, end);
+ registry.put(key, sel);
+ }
+ return sel.uri;
+ }
+
+ public Iterator<Selector> iterator() {
+ return registry.values().iterator();
+ }
+
+ public int getSize() {
+ return registry.size();
+ }
}
Modified:
incubator/clerezza/trunk/parent/uima/uima.casconsumer/src/test/java/org/apache/clerezza/uima/casconsumer/ClerezzaCASConsumerTest.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/uima/uima.casconsumer/src/test/java/org/apache/clerezza/uima/casconsumer/ClerezzaCASConsumerTest.java?rev=1339849&r1=1339848&r2=1339849&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/uima/uima.casconsumer/src/test/java/org/apache/clerezza/uima/casconsumer/ClerezzaCASConsumerTest.java
(original)
+++
incubator/clerezza/trunk/parent/uima/uima.casconsumer/src/test/java/org/apache/clerezza/uima/casconsumer/ClerezzaCASConsumerTest.java
Thu May 17 20:31:31 2012
@@ -72,7 +72,6 @@ public class ClerezzaCASConsumerTest {
MGraph createdGraph = TcManager.getInstance().getMGraph(new
UriRef("mytest-clerezza-uima-graph"));
assertNotNull(createdGraph);
} catch (Exception e) {
- e.printStackTrace();
fail(e.getLocalizedMessage());
}
}
Modified:
incubator/clerezza/trunk/parent/uima/uima.casconsumer/src/test/java/org/apache/clerezza/uima/casconsumer/ao/AnnotationOntologyCASConsumerTest.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/uima/uima.casconsumer/src/test/java/org/apache/clerezza/uima/casconsumer/ao/AnnotationOntologyCASConsumerTest.java?rev=1339849&r1=1339848&r2=1339849&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/uima/uima.casconsumer/src/test/java/org/apache/clerezza/uima/casconsumer/ao/AnnotationOntologyCASConsumerTest.java
(original)
+++
incubator/clerezza/trunk/parent/uima/uima.casconsumer/src/test/java/org/apache/clerezza/uima/casconsumer/ao/AnnotationOntologyCASConsumerTest.java
Thu May 17 20:31:31 2012
@@ -18,9 +18,6 @@
*/
package org.apache.clerezza.uima.casconsumer.ao;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-
import org.apache.clerezza.rdf.core.MGraph;
import org.apache.clerezza.rdf.core.UriRef;
import org.apache.clerezza.rdf.core.access.TcManager;
@@ -38,6 +35,9 @@ import org.apache.uima.test.junit_extens
import org.apache.uima.util.CasCreationUtils;
import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
/**
* TestCase for {@link ClerezzaCASConsumer} using {@link AOMappingStrategy}
*/
@@ -63,7 +63,6 @@ public class AnnotationOntologyCASConsum
MGraph createdGraph = TcManager.getInstance().getMGraph(new
UriRef("mytest-clerezza-ao-graph"));
assertNotNull(createdGraph);
} catch (Exception e) {
- e.printStackTrace();
fail(e.getLocalizedMessage());
}
}
