Author: rwesten
Date: Wed May 14 07:22:03 2014
New Revision: 1594498
URL: http://svn.apache.org/r1594498
Log:
STANBOL-488: merged name changes to RequestProperties to trunk; also removed
classes and methods marked as deprecated in 0.12.1 for 1.0.0
Added:
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/utils/RequestPropertiesHelper.java
- copied unchanged from r1594490,
stanbol/branches/release-0.12/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/utils/RequestPropertiesHelper.java
Removed:
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/utils/EnhancementPropertiesHelper.java
Modified:
stanbol/trunk/ (props changed)
stanbol/trunk/enhancer/ (props changed)
stanbol/trunk/enhancer/generic/servicesapi/ (props changed)
stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/ContentItemHelper.java
stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/EnhancementEngineHelper.java
stanbol/trunk/enhancer/generic/servicesapi/src/test/java/org/apache/stanbol/enhancer/serviceapi/helper/EnhancementPropertyTest.java
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/reader/ContentItemReader.java
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/AbstractEnhancerResource.java
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource.java
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/GenericEnhancerUiResource.java
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/writers/ContentItemWriter.java
stanbol/trunk/enhancer/jersey/src/test/java/org/apache/stanbol/enhancer/jersey/ContentItemReaderWriterTest.java
Propchange: stanbol/trunk/
------------------------------------------------------------------------------
Merged /stanbol/branches/release-0.12:r1594490
Propchange: stanbol/trunk/enhancer/
------------------------------------------------------------------------------
Merged /stanbol/branches/release-0.12/enhancer:r1594490
Propchange: stanbol/trunk/enhancer/generic/servicesapi/
------------------------------------------------------------------------------
Merged /stanbol/branches/release-0.12/enhancer/generic/servicesapi:r1594490
Modified:
stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/ContentItemHelper.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/ContentItemHelper.java?rev=1594498&r1=1594497&r2=1594498&view=diff
==============================================================================
---
stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/ContentItemHelper.java
(original)
+++
stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/ContentItemHelper.java
Wed May 14 07:22:03 2014
@@ -368,12 +368,12 @@ public final class ContentItemHelper {
"urn:apache.org:stanbol.web:enhancement.properties");
/**
- * Getter for the EnhancementProperties content part
+ * Getter for the content part holding the request scoped
EnhancementProperties.
* @param ci the content item
* @return the content part or <code>null</code> if not present.
*/
@SuppressWarnings("unchecked")
- public static Map<String,Object>
getEnhancementPropertiesContentPart(ContentItem ci){
+ public static Map<String,Object>
getRequestPropertiesContentPart(ContentItem ci){
if(ci == null){
throw new IllegalArgumentException("The parsed ContentItem MUST
NOT be NULL!");
}
@@ -389,7 +389,7 @@ public final class ContentItemHelper {
}
/**
- * Initialises the EnhancementProperties ContentPart for an {@link
ContentItem}.
+ * Initialises the ContentPart holding the request scoped
EnhancementProperties.
* If the content part is already present it will just return the
existing. If
* not it will register an empty one. The content part is registered with
* the URI {@link #ENHANCEMENT_PROPERTIES_URI}
@@ -398,7 +398,7 @@ public final class ContentItemHelper {
* @throws IllegalArgumentException if <code>null</code> is parsed as
{@link ContentItem}.
*/
@SuppressWarnings("unchecked")
- public static Map<String,Object>
initEnhancementPropertiesContentPart(ContentItem ci){
+ public static Map<String,Object>
initRequestPropertiesContentPart(ContentItem ci){
if(ci == null){
throw new IllegalArgumentException("The parsed ContentItem MUST
NOT be NULL!");
}
@@ -424,6 +424,45 @@ public final class ContentItemHelper {
} //else was already present
return enhancementProperties;
}
-
+ /**
+ * Sets a request scoped EnhancementProperty to the parsed contentItem. If
+ * <code>null</code> is parsed as value the property is removed.<p>
+ * This Method will retrieve the RequestProperties contentPart from the
+ * parsed {@link ContentItem} and adds the parsed property by applying the
+ * <code>[{engine-name}:]{key}</code> encoding to the key.<p>
+ * This method acquires a write lock on the ContentItem when writing
+ * the enhancement property.
+ * @param ci the ContentItem to set the enhancement property. MUST NOT be
+ * <code>null</code>
+ * @param engineName the engine or <code>null</code> to set the property
for the
+ * chain.
+ * @param key the key of the property. MUST NOT be <code>null</code>
+ * @param value the value or <code>null</code> to remove the property
+ * @return the old value or <code>null</code> if the property was not
present
+ * @throws IllegalArgumentException if <code>null</code> is parsed as
+ * {@link ContentItem} or key.
+ */
+ public static Object setRequestProperty(ContentItem ci, String engineName,
String key, Object value){
+ if(ci == null){
+ throw new IllegalArgumentException("The parsed ContentItem MUST
NOT be NULL!");
+ }
+ if(key == null || key.isEmpty()){
+ throw new IllegalArgumentException("The parsed Enhancement
Property key MUST NOT be NULL nor empty!");
+ }
+ Map<String,Object> enhProp = initRequestPropertiesContentPart(ci);
+ if(engineName != null){
+ key = new
StringBuilder(engineName).append(':').append(key).toString();
+ }
+ ci.getLock().writeLock().lock();
+ try {
+ if(value == null){
+ return enhProp.remove(key);
+ } else {
+ return enhProp.put(key, value);
+ }
+ } finally {
+ ci.getLock().writeLock().unlock();
+ }
+ }
}
Modified:
stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/EnhancementEngineHelper.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/EnhancementEngineHelper.java?rev=1594498&r1=1594497&r2=1594498&view=diff
==============================================================================
---
stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/EnhancementEngineHelper.java
(original)
+++
stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/EnhancementEngineHelper.java
Wed May 14 07:22:03 2014
@@ -873,7 +873,7 @@ public final class EnhancementEngineHelp
// with the `em:ChainExecution` node and engine specific
properties
// with the `em:EngineExecution` node.
// So this code will need to be refactored similar to the above
one
- Map<String,Object> epContentPart =
ContentItemHelper.getEnhancementPropertiesContentPart(ci);
+ Map<String,Object> epContentPart =
ContentItemHelper.getRequestPropertiesContentPart(ci);
Map<String,Object> chainProperties = new HashMap<String,Object>();
Map<String,Object> engineProperties = new HashMap<String,Object>();
if(epContentPart != null){
Modified:
stanbol/trunk/enhancer/generic/servicesapi/src/test/java/org/apache/stanbol/enhancer/serviceapi/helper/EnhancementPropertyTest.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/generic/servicesapi/src/test/java/org/apache/stanbol/enhancer/serviceapi/helper/EnhancementPropertyTest.java?rev=1594498&r1=1594497&r2=1594498&view=diff
==============================================================================
---
stanbol/trunk/enhancer/generic/servicesapi/src/test/java/org/apache/stanbol/enhancer/serviceapi/helper/EnhancementPropertyTest.java
(original)
+++
stanbol/trunk/enhancer/generic/servicesapi/src/test/java/org/apache/stanbol/enhancer/serviceapi/helper/EnhancementPropertyTest.java
Wed May 14 07:22:03 2014
@@ -245,7 +245,7 @@ public class EnhancementPropertyTest {
initExecutionMetadata(new TestChain("test", engines));
//(1) test a a enhancement property overridden with a engine specific
one
- Map<String,Object> ep =
ContentItemHelper.initEnhancementPropertiesContentPart(contentItem);
+ Map<String,Object> ep =
ContentItemHelper.initRequestPropertiesContentPart(contentItem);
assertNotNull("EnhancementProperties ContentPart was not
initialised",ep);
ep.put(PROPERTY_MAX_SUGGESTIONS, "5"); //global property
@@ -264,7 +264,7 @@ public class EnhancementPropertyTest {
Collection<String> derefernceLanguages = Arrays.asList("en","de");
//(1) test a a enhancement property overridden with a engine specific
one
- Map<String,Object> ep =
ContentItemHelper.initEnhancementPropertiesContentPart(contentItem);
+ Map<String,Object> ep =
ContentItemHelper.initRequestPropertiesContentPart(contentItem);
assertNotNull("EnhancementProperties ContentPart was not
initialised",ep);
ep.put(PROPERTY_DEREFERENCE_LANGUAGES, derefernceLanguages); //global
property
@@ -284,7 +284,7 @@ public class EnhancementPropertyTest {
Collection<String> derefernceLanguages = Arrays.asList("en","de");
String maxSuggestions = "5";
//(1) test a a enhancement property overridden with a engine specific
one
- Map<String,Object> ep =
ContentItemHelper.initEnhancementPropertiesContentPart(contentItem);
+ Map<String,Object> ep =
ContentItemHelper.initRequestPropertiesContentPart(contentItem);
assertNotNull("EnhancementProperties ContentPart was not
initialised",ep);
ep.put(linking.getName()+':'+PROPERTY_MAX_SUGGESTIONS, maxSuggestions);
ep.put(dereference.getName()+':'+PROPERTY_DEREFERENCE_LANGUAGES,
derefernceLanguages);
@@ -317,7 +317,7 @@ public class EnhancementPropertyTest {
//(1) test a a enhancement property overridden with a engine specific
one
String specific = linking.getName();
- Map<String,Object> ep =
ContentItemHelper.initEnhancementPropertiesContentPart(contentItem);
+ Map<String,Object> ep =
ContentItemHelper.initRequestPropertiesContentPart(contentItem);
assertNotNull("EnhancementProperties ContentPart was not
initialised",ep);
ep.put(PROPERTY_MAX_SUGGESTIONS, "5"); //global property
ep.put(specific+':'+PROPERTY_MAX_SUGGESTIONS, "10");//engine specific
@@ -518,7 +518,7 @@ public class EnhancementPropertyTest {
initExecutionMetadata(new TestChain("test", engines,
enhancementProperties));
- Map<String,Object> ep =
ContentItemHelper.initEnhancementPropertiesContentPart(contentItem);
+ Map<String,Object> ep =
ContentItemHelper.initRequestPropertiesContentPart(contentItem);
assertNotNull("EnhancementProperties ContentPart was not
initialised",ep);
ep.put(linking.getName()+':'+PROPERTY_MAX_SUGGESTIONS,
requestMaySuggestion);
ep.put(dereference.getName()+':'+PROPERTY_DEREFERENCE_LANGUAGES,
requestDerefLang);
Modified:
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/reader/ContentItemReader.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/reader/ContentItemReader.java?rev=1594498&r1=1594497&r2=1594498&view=diff
==============================================================================
---
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/reader/ContentItemReader.java
(original)
+++
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/reader/ContentItemReader.java
Wed May 14 07:22:03 2014
@@ -17,9 +17,8 @@
package org.apache.stanbol.enhancer.jersey.reader;
import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE;
-import static
org.apache.stanbol.enhancer.jersey.utils.EnhancementPropertiesHelper.ENHANCEMENT_PROPERTIES_URI;
-import static
org.apache.stanbol.enhancer.jersey.utils.EnhancementPropertiesHelper.PARSED_CONTENT_URIS;
-import static
org.apache.stanbol.enhancer.jersey.utils.EnhancementPropertiesHelper.getEnhancementProperties;
+import static
org.apache.stanbol.enhancer.jersey.utils.RequestPropertiesHelper.ENHANCEMENT_PROPERTIES_URI;
+import static
org.apache.stanbol.enhancer.jersey.utils.RequestPropertiesHelper.PARSED_CONTENT_URIS;
import static
org.apache.stanbol.enhancer.servicesapi.helper.EnhancementEngineHelper.randomUUID;
import java.io.ByteArrayInputStream;
@@ -68,6 +67,7 @@ import org.apache.stanbol.commons.indexe
import org.apache.stanbol.enhancer.servicesapi.Blob;
import org.apache.stanbol.enhancer.servicesapi.ContentItem;
import org.apache.stanbol.enhancer.servicesapi.ContentItemFactory;
+import org.apache.stanbol.enhancer.servicesapi.helper.ContentItemHelper;
import org.apache.stanbol.enhancer.servicesapi.impl.StreamSource;
import org.codehaus.jettison.json.JSONArray;
import org.codehaus.jettison.json.JSONException;
@@ -174,12 +174,12 @@ public class ContentItemReader implement
contentItem = createContentItem(contentItemId,
metadata, fis, parsedContentIds);
} else if(fis.getFieldName().equals("properties") ||
fis.getFieldName().equals(ENHANCEMENT_PROPERTIES_URI.getUnicodeString())){
- //parse the enhancementProperties
+ //parse the RequestProperties
if(contentItem == null){
throw new WebApplicationException(
Response.status(Response.Status.BAD_REQUEST)
.entity("Multipart MIME parts for " +
- "EnhancementProperties MUST BE
after the " +
+ "Request Properties MUST BE
after the " +
"MIME parts for 'metadata' AND
'content'")
.build());
}
@@ -187,7 +187,7 @@ public class ContentItemReader implement
if(!APPLICATION_JSON_TYPE.isCompatible(propMediaType)){
throw new WebApplicationException(
Response.status(Response.Status.BAD_REQUEST)
- .entity("EnhancementProperties (Multipart MIME
parts" +
+ .entity("Request Properties (Multipart MIME
parts" +
"with the name
'"+fis.getFieldName()+"') MUST " +
"BE encoded as
'appicaltion/json' (encountered: '" +
fis.getContentType()+"')!")
@@ -197,14 +197,15 @@ public class ContentItemReader implement
if(propCharset == null){
propCharset = "UTF-8";
}
- Map<String,Object> enhancementProperties =
getEnhancementProperties(contentItem);
+ Map<String,Object> reqProp =
+
ContentItemHelper.initRequestPropertiesContentPart(contentItem);
try {
- enhancementProperties.putAll(toMap(new JSONObject(
+ reqProp.putAll(toMap(new JSONObject(
IOUtils.toString(fis.openStream(),propCharset))));
} catch (JSONException e) {
throw new WebApplicationException(e,
Response.status(Response.Status.BAD_REQUEST)
- .entity("Unable to parse EnhancementProperties
from" +
+ .entity("Unable to parse Request Properties
from" +
"Multipart MIME parts with the
name 'properties'!")
.build());
}
@@ -261,7 +262,7 @@ public class ContentItemReader implement
parsedContentIds.add(contentItem.getPartUri(0).getUnicodeString());
}
//set the parsed contentIDs to the EnhancementProperties
- Map<String,Object> ep = getEnhancementProperties(contentItem);
+ Map<String,Object> ep =
ContentItemHelper.initRequestPropertiesContentPart(contentItem);
parseEnhancementPropertiesFromParameters(ep);
ep.put(PARSED_CONTENT_URIS,
Collections.unmodifiableSet(parsedContentIds));
return contentItem;
Modified:
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/AbstractEnhancerResource.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/AbstractEnhancerResource.java?rev=1594498&r1=1594497&r2=1594498&view=diff
==============================================================================
---
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/AbstractEnhancerResource.java
(original)
+++
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/AbstractEnhancerResource.java
Wed May 14 07:22:03 2014
@@ -25,13 +25,12 @@ import static org.apache.clerezza.rdf.co
import static
org.apache.clerezza.rdf.core.serializedform.SupportedFormat.TURTLE;
import static
org.apache.clerezza.rdf.core.serializedform.SupportedFormat.X_TURTLE;
import static org.apache.stanbol.commons.web.base.utils.MediaTypeUtil.JSON_LD;
-import static
org.apache.stanbol.enhancer.jersey.utils.EnhancementPropertiesHelper.INCLUDE_EXECUTION_METADATA;
-import static
org.apache.stanbol.enhancer.jersey.utils.EnhancementPropertiesHelper.OMIT_METADATA;
-import static
org.apache.stanbol.enhancer.jersey.utils.EnhancementPropertiesHelper.OMIT_PARSED_CONTENT;
-import static
org.apache.stanbol.enhancer.jersey.utils.EnhancementPropertiesHelper.OUTPUT_CONTENT;
-import static
org.apache.stanbol.enhancer.jersey.utils.EnhancementPropertiesHelper.OUTPUT_CONTENT_PART;
-import static
org.apache.stanbol.enhancer.jersey.utils.EnhancementPropertiesHelper.RDF_FORMAT;
-import static
org.apache.stanbol.enhancer.jersey.utils.EnhancementPropertiesHelper.getEnhancementProperties;
+import static
org.apache.stanbol.enhancer.jersey.utils.RequestPropertiesHelper.INCLUDE_EXECUTION_METADATA;
+import static
org.apache.stanbol.enhancer.jersey.utils.RequestPropertiesHelper.OMIT_METADATA;
+import static
org.apache.stanbol.enhancer.jersey.utils.RequestPropertiesHelper.OMIT_PARSED_CONTENT;
+import static
org.apache.stanbol.enhancer.jersey.utils.RequestPropertiesHelper.OUTPUT_CONTENT;
+import static
org.apache.stanbol.enhancer.jersey.utils.RequestPropertiesHelper.OUTPUT_CONTENT_PART;
+import static
org.apache.stanbol.enhancer.jersey.utils.RequestPropertiesHelper.RDF_FORMAT;
import java.io.IOException;
import java.util.HashSet;
@@ -59,7 +58,7 @@ import org.apache.stanbol.commons.web.ba
import org.apache.stanbol.commons.web.base.resource.LayoutConfiguration;
import
org.apache.stanbol.commons.web.base.resource.TemplateLayoutConfiguration;
import org.apache.stanbol.commons.web.base.utils.MediaTypeUtil;
-import org.apache.stanbol.enhancer.jersey.utils.EnhancementPropertiesHelper;
+import org.apache.stanbol.enhancer.jersey.utils.RequestPropertiesHelper;
import org.apache.stanbol.enhancer.servicesapi.Chain;
import org.apache.stanbol.enhancer.servicesapi.ChainException;
import org.apache.stanbol.enhancer.servicesapi.ChainManager;
@@ -70,6 +69,7 @@ import org.apache.stanbol.enhancer.servi
import org.apache.stanbol.enhancer.servicesapi.EnhancementException;
import org.apache.stanbol.enhancer.servicesapi.EnhancementJobManager;
import org.apache.stanbol.enhancer.servicesapi.NoSuchPartException;
+import org.apache.stanbol.enhancer.servicesapi.helper.ContentItemHelper;
import org.apache.stanbol.enhancer.servicesapi.rdf.ExecutionMetadata;
/**
@@ -179,12 +179,12 @@ public abstract class AbstractEnhancerRe
@QueryParam(value = "omitMetadata") boolean omitMetadata,
@QueryParam(value = "rdfFormat") String rdfFormat,
@Context HttpHeaders headers) throws EnhancementException,
IOException {
- Map<String,Object> enhancementProperties =
getEnhancementProperties(ci);
- enhancementProperties.put(INCLUDE_EXECUTION_METADATA,
inclExecMetadata);
+ Map<String,Object> reqProp =
ContentItemHelper.initRequestPropertiesContentPart(ci);
+ reqProp.put(INCLUDE_EXECUTION_METADATA, inclExecMetadata);
if(mediaTypes != null && !mediaTypes.isEmpty()){
- enhancementProperties.put(OUTPUT_CONTENT, mediaTypes);
+ reqProp.put(OUTPUT_CONTENT, mediaTypes);
}
- enhancementProperties.put(OMIT_PARSED_CONTENT, omitParsed);
+ reqProp.put(OMIT_PARSED_CONTENT, omitParsed);
if(contentParts != null && !contentParts.isEmpty()){
Set<UriRef> outputContentParts = new HashSet<UriRef>();
for(String contentPartUri : contentParts){
@@ -196,12 +196,12 @@ public abstract class AbstractEnhancerRe
}
}
}
- enhancementProperties.put(OUTPUT_CONTENT_PART, outputContentParts);
+ reqProp.put(OUTPUT_CONTENT_PART, outputContentParts);
}
- enhancementProperties.put(OMIT_METADATA, omitMetadata);
+ reqProp.put(OMIT_METADATA, omitMetadata);
if(rdfFormat != null && !rdfFormat.isEmpty()){
try {
-
enhancementProperties.put(RDF_FORMAT,MediaType.valueOf(rdfFormat).toString());
+
reqProp.put(RDF_FORMAT,MediaType.valueOf(rdfFormat).toString());
} catch (IllegalArgumentException e) {
throw new WebApplicationException(e,
Response.status(Response.Status.BAD_REQUEST)
@@ -210,7 +210,7 @@ public abstract class AbstractEnhancerRe
.build());
}
}
- enhance(ci);
+ enhance(ci,reqProp);
ResponseBuilder rb = Response.ok(ci);
MediaType mediaType = MediaTypeUtil.getAcceptableMediaType(headers,
null);
if (mediaType != null) {
@@ -223,15 +223,15 @@ public abstract class AbstractEnhancerRe
/**
* Enhances the parsed ContentItem
* @param ci the content item to enhance
+ * @param reqProp the request properties or <code>null</code> if none
* @throws EnhancementException
*/
- protected void enhance(ContentItem ci) throws EnhancementException {
- Map<String,Object> enhancementPropertis =
EnhancementPropertiesHelper.getEnhancementProperties(ci);
+ protected void enhance(ContentItem ci, Map<String,Object> reqProp) throws
EnhancementException {
if (jobManager != null) {
jobManager.enhanceContent(ci, getChain());
}
MGraph graph = ci.getMetadata();
- Boolean includeExecutionMetadata =
(Boolean)enhancementPropertis.get(INCLUDE_EXECUTION_METADATA);
+ Boolean includeExecutionMetadata =
RequestPropertiesHelper.isIncludeExecutionMetadata(reqProp);
if (includeExecutionMetadata != null &&
includeExecutionMetadata.booleanValue()) {
try {
graph.addAll(ci.getPart(ExecutionMetadata.CHAIN_EXECUTION,
TripleCollection.class));
Modified:
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource.java?rev=1594498&r1=1594497&r2=1594498&view=diff
==============================================================================
---
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource.java
(original)
+++
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource.java
Wed May 14 07:22:03 2014
@@ -97,11 +97,8 @@ import org.apache.stanbol.enhancer.servi
import org.apache.stanbol.enhancer.servicesapi.helper.execution.ChainExecution;
import org.apache.stanbol.enhancer.servicesapi.helper.execution.Execution;
import org.apache.stanbol.enhancer.servicesapi.rdf.ExecutionMetadata;
-import org.apache.stanbol.enhancer.servicesapi.rdf.NamespaceEnum;
import org.apache.stanbol.enhancer.servicesapi.rdf.OntologicalClasses;
import org.apache.stanbol.enhancer.servicesapi.rdf.Properties;
-import org.apache.stanbol.enhancer.servicesapi.rdf.TechnicalClasses;
-import
org.apache.stanbol.enhancer.servicesapi.rdf.TechnicalClasses.CONFIDENCE_LEVEL_ENUM;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/GenericEnhancerUiResource.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/GenericEnhancerUiResource.java?rev=1594498&r1=1594497&r2=1594498&view=diff
==============================================================================
---
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/GenericEnhancerUiResource.java
(original)
+++
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/GenericEnhancerUiResource.java
Wed May 14 07:22:03 2014
@@ -135,7 +135,7 @@ public class GenericEnhancerUiResource e
} else { //enhance and build the AJAX response
EnhancementException enhancementException;
try {
- enhance(ci);
+ enhance(ci, null);
enhancementException = null;
} catch (EnhancementException e){
enhancementException = e;
Modified:
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/writers/ContentItemWriter.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/writers/ContentItemWriter.java?rev=1594498&r1=1594497&r2=1594498&view=diff
==============================================================================
---
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/writers/ContentItemWriter.java
(original)
+++
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/writers/ContentItemWriter.java
Wed May 14 07:22:03 2014
@@ -20,13 +20,13 @@ import static javax.ws.rs.core.MediaType
import static javax.ws.rs.core.MediaType.MULTIPART_FORM_DATA_TYPE;
import static javax.ws.rs.core.MediaType.TEXT_PLAIN_TYPE;
import static javax.ws.rs.core.MediaType.WILDCARD_TYPE;
-import static
org.apache.stanbol.enhancer.jersey.utils.EnhancementPropertiesHelper.ENHANCEMENT_PROPERTIES_URI;
-import static
org.apache.stanbol.enhancer.jersey.utils.EnhancementPropertiesHelper.getEnhancementProperties;
-import static
org.apache.stanbol.enhancer.jersey.utils.EnhancementPropertiesHelper.getOutputContent;
-import static
org.apache.stanbol.enhancer.jersey.utils.EnhancementPropertiesHelper.getOutputContentParts;
-import static
org.apache.stanbol.enhancer.jersey.utils.EnhancementPropertiesHelper.getParsedContentURIs;
-import static
org.apache.stanbol.enhancer.jersey.utils.EnhancementPropertiesHelper.isOmitMetadata;
-import static
org.apache.stanbol.enhancer.jersey.utils.EnhancementPropertiesHelper.isOmitParsedContent;
+import static
org.apache.stanbol.enhancer.jersey.utils.RequestPropertiesHelper.ENHANCEMENT_PROPERTIES_URI;
+import static
org.apache.stanbol.enhancer.jersey.utils.RequestPropertiesHelper.getOutputContent;
+import static
org.apache.stanbol.enhancer.jersey.utils.RequestPropertiesHelper.getOutputContentParts;
+import static
org.apache.stanbol.enhancer.jersey.utils.RequestPropertiesHelper.getParsedContentURIs;
+import static
org.apache.stanbol.enhancer.jersey.utils.RequestPropertiesHelper.getRdfFormat;
+import static
org.apache.stanbol.enhancer.jersey.utils.RequestPropertiesHelper.isOmitMetadata;
+import static
org.apache.stanbol.enhancer.jersey.utils.RequestPropertiesHelper.isOmitParsedContent;
import static
org.apache.stanbol.enhancer.servicesapi.helper.ContentItemHelper.getBlob;
import static
org.apache.stanbol.enhancer.servicesapi.helper.ContentItemHelper.getContentParts;
@@ -77,9 +77,9 @@ import org.apache.http.entity.mime.conte
import org.apache.http.entity.mime.content.ContentBody;
import org.apache.http.entity.mime.content.ContentDescriptor;
import org.apache.http.entity.mime.content.InputStreamBody;
-import org.apache.stanbol.enhancer.jersey.utils.EnhancementPropertiesHelper;
import org.apache.stanbol.enhancer.servicesapi.Blob;
import org.apache.stanbol.enhancer.servicesapi.ContentItem;
+import org.apache.stanbol.enhancer.servicesapi.helper.ContentItemHelper;
import org.codehaus.jettison.json.JSONArray;
import org.codehaus.jettison.json.JSONException;
import org.codehaus.jettison.json.JSONObject;
@@ -172,8 +172,8 @@ public class ContentItemWriter implement
OutputStream entityStream) throws IOException,
WebApplicationException {
//(0) handle default dataType
- Map<String,Object> properties = getEnhancementProperties(ci);
- boolean omitMetadata = isOmitMetadata(properties);
+ Map<String,Object> reqProp =
ContentItemHelper.getRequestPropertiesContentPart(ci);
+ boolean omitMetadata = isOmitMetadata(reqProp);
if(!MULTIPART.isCompatible(mediaType)){ //two possible cases
if(!omitMetadata){ // (1) just return the RDF data
//(1.a) Backward support for default dataType if no Accept
header is set
@@ -230,7 +230,7 @@ public class ContentItemWriter implement
final String charsetName =
mediaType.getParameters().get("charset");
final Charset charset = charsetName != null ?
Charset.forName(charsetName) : UTF8;
MediaType rdfFormat;
- String rdfFormatString =
EnhancementPropertiesHelper.getRdfFormat(properties);
+ String rdfFormatString = getRdfFormat(reqProp);
if(rdfFormatString == null || rdfFormatString.isEmpty()){
rdfFormat = DEFAULT_RDF_FORMAT;
} else {
@@ -257,7 +257,7 @@ public class ContentItemWriter implement
entityBuilder.setBoundary(CONTENT_ITEM_BOUNDARY);
//HttpMultipart entity = new HttpMultipart("from-data", charset
,CONTENT_ITEM_BOUNDARY);
//(2) serialising the metadata
- if(!isOmitMetadata(properties)){
+ if(!isOmitMetadata(reqProp)){
entityBuilder.addPart("metadata", new ClerezzaContentBody(
ci.getUri().getUnicodeString(), ci.getMetadata(),
rdfFormat));
// entity.addBodyPart(new FormBodyPart("metadata", new
ClerezzaContentBody(
@@ -266,7 +266,7 @@ public class ContentItemWriter implement
}
//(3) serialising the Content (Bloby)
//(3.a) Filter based on parameter
- List<Entry<UriRef,Blob>> includedBlobs = filterBlobs(ci,
properties);
+ List<Entry<UriRef,Blob>> includedBlobs = filterBlobs(ci, reqProp);
//(3.b) Serialise the filtered
if(!includedBlobs.isEmpty()) {
Map<String,ContentBody> contentParts = new
LinkedHashMap<String,ContentBody>();
@@ -284,17 +284,17 @@ public class ContentItemWriter implement
entityBuilder.addPart("content", new
MultipartContentBody(contentParts,
CONTENT_PARTS_BOUNDERY, MULTIPART_ALTERNATE));
} //else no content to include
- Set<String> includeContentParts =
getIncludedContentPartURIs(properties);
+ Set<String> includeContentParts =
getIncludedContentPartURIs(reqProp);
if(includeContentParts != null){
- //(4) serialise EnhancementProperties
+ //(4) serialise the Request Properties
if(includeContentParts.isEmpty() ||
includeContentParts.contains(
ENHANCEMENT_PROPERTIES_URI.getUnicodeString())) {
JSONObject object;
try {
- object = toJson(properties);
+ object = toJson(reqProp);
} catch (JSONException e) {
- String message = "Unable to convert
EnhancementProperties "
- + "to JSON (values : "+properties+")!";
+ String message = "Unable to convert Request Properties
"
+ + "to JSON (values : "+reqProp+")!";
log.error(message,e);
throw new WebApplicationException(message,
Response.Status.INTERNAL_SERVER_ERROR);
}
Modified:
stanbol/trunk/enhancer/jersey/src/test/java/org/apache/stanbol/enhancer/jersey/ContentItemReaderWriterTest.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/jersey/src/test/java/org/apache/stanbol/enhancer/jersey/ContentItemReaderWriterTest.java?rev=1594498&r1=1594497&r2=1594498&view=diff
==============================================================================
---
stanbol/trunk/enhancer/jersey/src/test/java/org/apache/stanbol/enhancer/jersey/ContentItemReaderWriterTest.java
(original)
+++
stanbol/trunk/enhancer/jersey/src/test/java/org/apache/stanbol/enhancer/jersey/ContentItemReaderWriterTest.java
Wed May 14 07:22:03 2014
@@ -16,14 +16,14 @@
*/
package org.apache.stanbol.enhancer.jersey;
-import static
org.apache.stanbol.enhancer.jersey.utils.EnhancementPropertiesHelper.ENHANCEMENT_PROPERTIES_URI;
-import static
org.apache.stanbol.enhancer.jersey.utils.EnhancementPropertiesHelper.OUTPUT_CONTENT;
-import static
org.apache.stanbol.enhancer.jersey.utils.EnhancementPropertiesHelper.OUTPUT_CONTENT_PART;
-import static
org.apache.stanbol.enhancer.jersey.utils.EnhancementPropertiesHelper.PARSED_CONTENT_URIS;
-import static
org.apache.stanbol.enhancer.jersey.utils.EnhancementPropertiesHelper.RDF_FORMAT;
-import static
org.apache.stanbol.enhancer.jersey.utils.EnhancementPropertiesHelper.getEnhancementProperties;
-import static
org.apache.stanbol.enhancer.jersey.utils.EnhancementPropertiesHelper.getOutputContent;
-import static
org.apache.stanbol.enhancer.jersey.utils.EnhancementPropertiesHelper.getParsedContentURIs;
+import static
org.apache.stanbol.enhancer.jersey.utils.RequestPropertiesHelper.ENHANCEMENT_PROPERTIES_URI;
+import static
org.apache.stanbol.enhancer.jersey.utils.RequestPropertiesHelper.OUTPUT_CONTENT;
+import static
org.apache.stanbol.enhancer.jersey.utils.RequestPropertiesHelper.OUTPUT_CONTENT_PART;
+import static
org.apache.stanbol.enhancer.jersey.utils.RequestPropertiesHelper.PARSED_CONTENT_URIS;
+import static
org.apache.stanbol.enhancer.jersey.utils.RequestPropertiesHelper.RDF_FORMAT;
+import static
org.apache.stanbol.enhancer.jersey.utils.RequestPropertiesHelper.getOutputContent;
+import static
org.apache.stanbol.enhancer.jersey.utils.RequestPropertiesHelper.getParsedContentURIs;
+import static
org.apache.stanbol.enhancer.servicesapi.helper.ContentItemHelper.initRequestPropertiesContentPart;
import static
org.apache.stanbol.enhancer.servicesapi.helper.ExecutionMetadataHelper.initExecutionMetadata;
import static
org.apache.stanbol.enhancer.servicesapi.helper.ExecutionMetadataHelper.initExecutionMetadataContentPart;
import static
org.apache.stanbol.enhancer.servicesapi.helper.ExecutionPlanHelper.createExecutionPlan;
@@ -111,14 +111,14 @@ public class ContentItemReaderWriterTest
new UriRef("urn:test"), RDF.type, new
UriRef("urn:types:Document")));
//mark the main content as parsed and also that all
//contents and contentparts should be included
- Map<String,Object> properties = getEnhancementProperties(contentItem);
+ Map<String,Object> properties =
initRequestPropertiesContentPart(contentItem);
properties.put(PARSED_CONTENT_URIS,
Collections.singleton(contentItem.getPartUri(0).getUnicodeString()));
properties.put(OUTPUT_CONTENT, Collections.singleton("*/*"));
properties.put(OUTPUT_CONTENT_PART, Collections.singleton("*"));
properties.put(RDF_FORMAT, "application/rdf+xml");
MGraph em = initExecutionMetadataContentPart(contentItem);
- NonLiteral ep = createExecutionPlan(em, "testChain");
- writeExecutionNode(em, ep, "testEngine", true, null);
+ NonLiteral ep = createExecutionPlan(em, "testChain",null);
+ writeExecutionNode(em, ep, "testEngine", true, null,null);
initExecutionMetadata(em, em, contentItem.getUri(), "testChain",
false);
final Serializer serializer = new Serializer();
serializer.bindSerializingProvider(new JenaSerializerProvider());
@@ -239,10 +239,11 @@ public class ContentItemReaderWriterTest
assertNotNull(readExecutionMetadata);
assertEquals(executionMetadata.size(), readExecutionMetadata.size());
//validate EnhancemetnProperties
- Map<String,Object> properties = getEnhancementProperties(ci);
+ Map<String,Object> reqProp =
ContentItemHelper.getRequestPropertiesContentPart(ci);
+ assertNotNull(reqProp);
//the parsed value MUST BE overridden by the two content parts parsed
- assertEquals(expectedParsedContentIds,
getParsedContentURIs(properties));
- Collection<String> outputContent = getOutputContent(properties);
+ assertEquals(expectedParsedContentIds, getParsedContentURIs(reqProp));
+ Collection<String> outputContent = getOutputContent(reqProp);
assertEquals(1, outputContent.size());
assertEquals(outputContent.iterator().next(), "*/*");
Collection<String> outputContentPart = Collections.singleton("*");
