Author: rwesten
Date: Wed May 21 09:22:31 2014
New Revision: 1596518
URL: http://svn.apache.org/r1596518
Log:
implementation for STANBOL-660: The Content-Language header can now be used to
parse the language of the posted content; STANBOL-488: added Configuration
Utilities to the EnhancementEngineHelper; changed some inconsistent names found
while writing the documentation; added missing configuration properties to the
WeightedChain and GraphChain; added EnhancementProperties namespace to the
Stanbol mappings in the NamespacePrefixService; corrected the prefix of the
namespace in the NamespaceEnum to the same as used in the documentation
Modified:
stanbol/branches/release-0.12/commons/namespaceprefix/stanbolprovider/src/main/java/org/apache/stanbol/commons/namespaceprefix/mappings/DefaultNamespaceMappingsEnum.java
stanbol/branches/release-0.12/commons/tikabundle/ (props changed)
stanbol/branches/release-0.12/enhancer/chain/graph/src/main/java/org/apache/stanbol/enhancer/chain/graph/impl/GraphChain.java
stanbol/branches/release-0.12/enhancer/chain/weighted/src/main/java/org/apache/stanbol/enhancer/chain/weighted/impl/WeightedChain.java
stanbol/branches/release-0.12/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/ContentItemHelper.java
stanbol/branches/release-0.12/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/EnhancementEngineHelper.java
stanbol/branches/release-0.12/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/ExecutionPlanHelper.java
stanbol/branches/release-0.12/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/rdf/NamespaceEnum.java
stanbol/branches/release-0.12/enhancer/generic/servicesapi/src/test/java/org/apache/stanbol/enhancer/serviceapi/helper/EnhancementEngineHelperTest.java
stanbol/branches/release-0.12/enhancer/generic/servicesapi/src/test/java/org/apache/stanbol/enhancer/serviceapi/helper/EnhancementPropertyTest.java
stanbol/branches/release-0.12/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/reader/ContentItemReader.java
stanbol/branches/release-0.12/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/utils/EnhancementPropertiesHelper.java
stanbol/branches/release-0.12/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/utils/RequestPropertiesHelper.java
stanbol/branches/release-0.12/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/writers/ContentItemWriter.java
stanbol/branches/release-0.12/enhancer/jersey/src/test/java/org/apache/stanbol/enhancer/jersey/ContentItemReaderWriterTest.java
Modified:
stanbol/branches/release-0.12/commons/namespaceprefix/stanbolprovider/src/main/java/org/apache/stanbol/commons/namespaceprefix/mappings/DefaultNamespaceMappingsEnum.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/commons/namespaceprefix/stanbolprovider/src/main/java/org/apache/stanbol/commons/namespaceprefix/mappings/DefaultNamespaceMappingsEnum.java?rev=1596518&r1=1596517&r2=1596518&view=diff
==============================================================================
---
stanbol/branches/release-0.12/commons/namespaceprefix/stanbolprovider/src/main/java/org/apache/stanbol/commons/namespaceprefix/mappings/DefaultNamespaceMappingsEnum.java
(original)
+++
stanbol/branches/release-0.12/commons/namespaceprefix/stanbolprovider/src/main/java/org/apache/stanbol/commons/namespaceprefix/mappings/DefaultNamespaceMappingsEnum.java
Wed May 21 09:22:31 2014
@@ -219,7 +219,12 @@ public enum DefaultNamespaceMappingsEnum
* for freebase topics (entities) on external sites (e.g. musicbrainz,
* wikipedia ...).
*/
- key("http://rdf.freebase.com/key/";)
+ key("http://rdf.freebase.com/key/";),
+ /**
+ * The EnhancementProperties namespace as introduced by <a
+ * href="https://issues.apache.org/jira/browse/STANBOL-488";>STANBOL-488</<>
+ */
+ ehp("http://stanbol.apache.org/ontology/enhancementproperties#";),
;
private String namespace;
private String prefix;
Propchange: stanbol/branches/release-0.12/commons/tikabundle/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed May 21 09:22:31 2014
@@ -0,0 +1,7 @@
+target
+
+.settings
+
+.classpath
+
+.project
Modified:
stanbol/branches/release-0.12/enhancer/chain/graph/src/main/java/org/apache/stanbol/enhancer/chain/graph/impl/GraphChain.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancer/chain/graph/src/main/java/org/apache/stanbol/enhancer/chain/graph/impl/GraphChain.java?rev=1596518&r1=1596517&r2=1596518&view=diff
==============================================================================
---
stanbol/branches/release-0.12/enhancer/chain/graph/src/main/java/org/apache/stanbol/enhancer/chain/graph/impl/GraphChain.java
(original)
+++
stanbol/branches/release-0.12/enhancer/chain/graph/src/main/java/org/apache/stanbol/enhancer/chain/graph/impl/GraphChain.java
Wed May 21 09:22:31 2014
@@ -97,6 +97,7 @@ import org.slf4j.LoggerFactory;
@Property(name=Chain.PROPERTY_NAME),
@Property(name=GraphChain.PROPERTY_GRAPH_RESOURCE),
@Property(name=GraphChain.PROPERTY_CHAIN_LIST, cardinality=1000),
+ @Property(name=AbstractChain.PROPERTY_CHAIN_PROPERTIES,cardinality=1000),
@Property(name=Constants.SERVICE_RANKING, intValue=0)
})
public class GraphChain extends AbstractChain implements Chain {
Modified:
stanbol/branches/release-0.12/enhancer/chain/weighted/src/main/java/org/apache/stanbol/enhancer/chain/weighted/impl/WeightedChain.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancer/chain/weighted/src/main/java/org/apache/stanbol/enhancer/chain/weighted/impl/WeightedChain.java?rev=1596518&r1=1596517&r2=1596518&view=diff
==============================================================================
---
stanbol/branches/release-0.12/enhancer/chain/weighted/src/main/java/org/apache/stanbol/enhancer/chain/weighted/impl/WeightedChain.java
(original)
+++
stanbol/branches/release-0.12/enhancer/chain/weighted/src/main/java/org/apache/stanbol/enhancer/chain/weighted/impl/WeightedChain.java
Wed May 21 09:22:31 2014
@@ -89,6 +89,7 @@ policy=ConfigurationPolicy.REQUIRE)
@Properties(value={
@Property(name=Chain.PROPERTY_NAME),
@Property(name=WeightedChain.PROPERTY_CHAIN, cardinality=1000),
+ @Property(name=AbstractChain.PROPERTY_CHAIN_PROPERTIES,cardinality=1000),
@Property(name=Constants.SERVICE_RANKING, intValue=0)
})
@Service(value=Chain.class)
Modified:
stanbol/branches/release-0.12/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/ContentItemHelper.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/ContentItemHelper.java?rev=1596518&r1=1596517&r2=1596518&view=diff
==============================================================================
---
stanbol/branches/release-0.12/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/ContentItemHelper.java
(original)
+++
stanbol/branches/release-0.12/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/ContentItemHelper.java
Wed May 21 09:22:31 2014
@@ -363,11 +363,20 @@ public final class ContentItemHelper {
* URI used to register an {@link ContentItem#getPart(int, Class)
contentPart}
* of the type {@link Map Map<String,Objext>} containing the
* EnhancementEngine properties <p>
+ * @since 0.12.1
*/
- public static final UriRef ENHANCEMENT_PROPERTIES_URI = new UriRef(
- "urn:apache.org:stanbol.web:enhancement.properties");
+ public static final UriRef REQUEST_PROPERTIES_URI = new UriRef(
+ "urn:apache.org:stanbol.enhancer:request.properties");
/**
+ * URI used to register the {@link #REQUEST_PROPERTIES_URI} until
+ * <code>0.12.0</code>
+ */
+ @Deprecated
+ private static final UriRef WEB_ENHANCEMENT_PROPERTIES_URI = new UriRef(
+ "urn:apache.org:stanbol.web:enhancement.properties");
+
+ /**
* 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.
@@ -379,9 +388,14 @@ public final class ContentItemHelper {
}
ci.getLock().readLock().lock();
try {
- return ci.getPart(ENHANCEMENT_PROPERTIES_URI, Map.class);
+ return ci.getPart(REQUEST_PROPERTIES_URI, Map.class);
} catch (NoSuchPartException e) {
- return null;
+ //fallback to support pre 0.12.1 modules (remove with 1.0.0)
+ try {
+ return ci.getPart(WEB_ENHANCEMENT_PROPERTIES_URI, Map.class);
+ } catch (NoSuchPartException e2) {
+ return null;
+ }
} finally{
ci.getLock().readLock().unlock();
}
@@ -392,7 +406,7 @@ public final class ContentItemHelper {
* 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}
+ * the URI {@link #REQUEST_PROPERTIES_URI}
* @param ci the contentItem MUST NOT be NULL
* @return the enhancement properties
* @throws IllegalArgumentException if <code>null</code> is parsed as
{@link ContentItem}.
@@ -405,7 +419,7 @@ public final class ContentItemHelper {
Map<String,Object> enhancementProperties;
ci.getLock().readLock().lock();
try {
- enhancementProperties = ci.getPart(ENHANCEMENT_PROPERTIES_URI,
Map.class);
+ enhancementProperties = ci.getPart(REQUEST_PROPERTIES_URI,
Map.class);
} catch (NoSuchPartException e) {
enhancementProperties = null;
} finally{
@@ -414,10 +428,17 @@ public final class ContentItemHelper {
if(enhancementProperties == null){
ci.getLock().writeLock().lock();
try { //check again ... maybe an other thread has added this part
- enhancementProperties = ci.getPart(ENHANCEMENT_PROPERTIES_URI,
Map.class);
+ enhancementProperties = ci.getPart(REQUEST_PROPERTIES_URI,
Map.class);
} catch (NoSuchPartException e) {
- enhancementProperties = new HashMap<String,Object>();
- ci.addPart(ENHANCEMENT_PROPERTIES_URI, enhancementProperties);
+ //fallback to support pre 0.12.1 modules (remove with 1.0.0)
+ try { //NOTE: if the old is present we register it also with
the new URI
+ enhancementProperties =
ci.getPart(WEB_ENHANCEMENT_PROPERTIES_URI, Map.class);
+ } catch (NoSuchPartException e2) { /*ignore*/}
+ //END fallback
+ if(enhancementProperties == null) { //the old is not present
+ enhancementProperties = new HashMap<String,Object>();
//create
+ }
+ ci.addPart(REQUEST_PROPERTIES_URI, enhancementProperties);
} finally{
ci.getLock().writeLock().unlock();
}
Modified:
stanbol/branches/release-0.12/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/EnhancementEngineHelper.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/EnhancementEngineHelper.java?rev=1596518&r1=1596517&r2=1596518&view=diff
==============================================================================
---
stanbol/branches/release-0.12/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/EnhancementEngineHelper.java
(original)
+++
stanbol/branches/release-0.12/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/EnhancementEngineHelper.java
Wed May 21 09:22:31 2014
@@ -20,7 +20,11 @@ import static java.util.Collections.sing
import static org.apache.stanbol.enhancer.servicesapi.rdf.Properties.*;
import static org.apache.stanbol.enhancer.servicesapi.rdf.TechnicalClasses.*;
+import java.lang.reflect.Array;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
@@ -57,6 +61,8 @@ import org.apache.stanbol.enhancer.servi
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.ibm.icu.impl.CalendarAstronomer.Equatorial;
+
public final class EnhancementEngineHelper {
@@ -781,7 +787,7 @@ public final class EnhancementEngineHelp
* NOTE: in 1.0.0 those are obsolete as EnhancementProperties will be
parsed
* as additional parameter to the computeEnhancement method.
*/
- private static final String EHPROP_NS =
NamespaceEnum.ehprop.getNamespace();
+ private static final String EHPROP_NS = NamespaceEnum.ehp.getNamespace();
private static final int EHPROP_NS_LENGTH = EHPROP_NS.length();
/**
@@ -972,5 +978,198 @@ public final class EnhancementEngineHelp
return value;
}
-
+ /**
+ * Extracts multiple Configuration values from the parsed Object value.
+ * This does support arrays and {@link Collection}s for multiple values.
+ * In any other case a single value collection will be returned.
<code>NULL</code>
+ * value contained in the parsed value will be silently removed.
+ * @param value the value. {@link Collection}s and Arrays are supported for
+ * multiple values. If the parsed value is of an other type a single value
+ * is assumed.
+ * @param type the desired type of the configuration values. The parsed
type
+ * MUST define a {@link Constructor} taking a {@link String} as only
parameter.
+ * @return the configuration values as parsed from the parsed value
+ * @throws NullPointerException if the parsed type is <code>null</code>
+ * @throws IllegalArgumentException if the parsed type does not have a
+ * {@link Constructor} that takes a {@link String} as only parameter; if
the
+ * {@link Constructor} is not visible or can not be instantiated (e.g.
+ * because the parsed type is an Interface or an abstract class).
+ * @throws IllegalStateException if the parsed type can not be instantiated
+ * if one of the parsed values (e.g. if {@link Float} is used as type and
+ * one of the parsed values is not a valid float.
+ * @since 0.12.1
+ */
+ public static <T> Collection<T> getConfigValues(Object value, Class<T>
type){
+ return getConfigValues(value, type, false);
+ }
+ /**
+ * Extracts multiple Configuration values from the parsed Object value.
+ * This does support arrays and {@link Collection}s for multiple values.
+ * In any other case a single value collection will be returned.
+ * @param value the value. {@link Collection}s and Arrays are supported for
+ * multiple values. If the parsed value is of an other type a single value
+ * is assumed.
+ * @param type the desired type of the configuration values. The parsed
type
+ * MUST define a {@link Constructor} taking a {@link String} as only
parameter.
+ * @param preseveNullValues if <code>null</code> values in the parsed
+ * value should be preserved or removed.
+ * @return the configuration values as parsed from the parsed value
+ * @throws NullPointerException if the parsed type is <code>null</code>
+ * @throws IllegalArgumentException if the parsed type does not have a
+ * {@link Constructor} that takes a {@link String} as only parameter; if
the
+ * {@link Constructor} is not visible or can not be instantiated (e.g.
+ * because the parsed type is an Interface or an abstract class).
+ * @throws IllegalStateException if the parsed type can not be instantiated
+ * if one of the parsed values (e.g. if {@link Float} is used as type and
+ * one of the parsed values is not a valid float.
+ * @since 0.12.1
+ */
+ public static <T> Collection<T> getConfigValues(Object value, Class<T>
type,
+ boolean preseveNullValues){
+ if(value == null){
+ return null;
+ }
+ final Collection<?> values;
+ if(value instanceof Collection<?>){
+ values = (Collection<?>)value;
+ } else if(value.getClass().isArray()){
+ Class<?> componentType = value.getClass().getComponentType();
+ if(componentType.isPrimitive()){
+ int len = Array.getLength(value);
+ List<Object> av = new ArrayList<Object>(len);
+ for(int i = 0; i < len;i++){
+ av.add(Array.get(value, i));
+ }
+ values = av;
+ } else {
+ values = Arrays.asList((Object[])value);
+ }
+ } else {
+ values = Collections.singleton(value);
+ }
+ final Constructor<T> constructor = getConstigTypeConstructor(type);
+ Collection<T> configValues = new ArrayList<T>(values.size());
+ for(Object o : values){
+ if(o == null){
+ if(preseveNullValues){
+ configValues.add(null);
+ } //else skip
+ } else {
+ configValues.add(getConfigValue(o, type, constructor));
+ }
+ }
+ return configValues;
+ }
+
+ /**
+ * Extracts a single Configuration values from the parsed Object value.
+ * In case the parsed value is an Array or a Collection it will take the
+ * first non <code>null</code> value.
+ * @param value the value. In case of an Array or a Collection it will take
+ * the first non <code>null</code> value
+ * @param type the desired type of the configuration values. The parsed
type
+ * MUST define a {@link Constructor} taking a {@link String} as only
parameter.
+ * @param preseveNullValues if <code>null</code> values in the parsed
+ * value should be preserved or removed.
+ * @return the configuration value as parsed from the parsed value
+ * @throws NullPointerException if the parsed type is <code>null</code>
+ * @throws IllegalArgumentException if the parsed type does not have a
+ * {@link Constructor} that takes a {@link String} as only parameter; if
the
+ * {@link Constructor} is not visible or can not be instantiated (e.g.
+ * because the parsed type is an Interface or an abstract class).
+ * @throws IllegalStateException if the parsed type can not be instantiated
+ * if one of the parsed values (e.g. if {@link Float} is used as type and
+ * one of the parsed values is not a valid float.
+ * @since 0.12.1
+ */
+ public static final <T> T getFirstConfigValue(Object value, Class<T> type){
+ if(value == null){
+ return null;
+ }
+ Object first = null;
+ if(value instanceof Collection<?>){
+ Collection<?> c = (Collection<?>)value;
+ if(c.isEmpty()){
+ return null;
+ } else {
+ Iterator<?> it = c.iterator();
+ while(first == null && it.hasNext()){
+ first = it.next();
+ }
+ }
+ } else if(value.getClass().isArray()){
+ Class<?> componentType = value.getClass().getComponentType();
+ int len = Array.getLength(value);
+ if(len < 1){
+ return null;
+ } else {
+ if(componentType.isPrimitive()){
+ first = Array.get(value, 0);
+ } else {
+ for(int i=0; first == null && i < len; i++){
+ first = Array.get(value, i);
+ }
+ }
+ }
+ } else {
+ first = value;
+ }
+ return getConfigValue(first, type, getConstigTypeConstructor(type));
+ }
+
+ /**
+ * Internally used to get the config value for the parsed value and type.
+ * @param value
+ * @param type
+ * @param constructor the constructor typically retrieved by calling
+ * {@link #getConstigTypeConstructor(Class)} for the type
+ * @return the value
+ */
+ private static <T> T getConfigValue(Object value, Class<T> type, final
Constructor<T> constructor) {
+ if(value == null){
+ return null;
+ }
+ T configValue;
+ if(constructor == null){
+ configValue = type.cast(value.toString());
+ } else {
+ try {
+ configValue = constructor.newInstance(value.toString());
+ } catch (InstantiationException e) {
+ throw new IllegalArgumentException("Unable to instantiate the "
+ + "parsed value type '" + type.getClass().getName() +"'!",
e);
+ } catch (IllegalAccessException e) {
+ throw new IllegalArgumentException("Unable to access the "
+ + "constructor of the parsed value type '"
+ + type.getClass().getName() + "'!", e);
+ } catch (InvocationTargetException e) {
+ throw new IllegalStateException("Unable to instantiate the "
+ + "parsed value type '" + type.getClass().getName()
+ + "' with the String value '"+value+ "'!", e);
+ }
+ }
+ return configValue;
+ }
+
+ /**
+ * Internally used to get the String parameter constructor for the parsed
+ * config value type
+ * @param type
+ * @return
+ */
+ private static <T> Constructor<T> getConstigTypeConstructor(Class<T> type)
{
+ final Constructor<T> constructor;
+ if(String.class.equals(type)){
+ constructor = null;
+ } else {
+ try {
+ constructor = type.getConstructor(String.class);
+ } catch (NoSuchMethodException e) {
+ throw new IllegalArgumentException("Parsed config value type '"
+ + type.getClass().getName()+ "' does not define a
Constructor "
+ + "that takes a String as only parameter!", e);
+ }
+ }
+ return constructor;
+ }
}
Modified:
stanbol/branches/release-0.12/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/ExecutionPlanHelper.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/ExecutionPlanHelper.java?rev=1596518&r1=1596517&r2=1596518&view=diff
==============================================================================
---
stanbol/branches/release-0.12/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/ExecutionPlanHelper.java
(original)
+++
stanbol/branches/release-0.12/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/ExecutionPlanHelper.java
Wed May 21 09:22:31 2014
@@ -308,7 +308,7 @@ public final class ExecutionPlanHelper {
engineName == null ? "" : engineName});
} else {
writeEnhancementProperty(ep, node,
- new UriRef(NamespaceEnum.ehprop + enhprop.getKey()),
+ new UriRef(NamespaceEnum.ehp + enhprop.getKey()),
enhprop.getValue());
}
}
Modified:
stanbol/branches/release-0.12/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/rdf/NamespaceEnum.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/rdf/NamespaceEnum.java?rev=1596518&r1=1596517&r2=1596518&view=diff
==============================================================================
---
stanbol/branches/release-0.12/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/rdf/NamespaceEnum.java
(original)
+++
stanbol/branches/release-0.12/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/rdf/NamespaceEnum.java
Wed May 21 09:22:31 2014
@@ -102,7 +102,7 @@ public enum NamespaceEnum {
* Namespace used for EnhancementProperties
* @since 0.12.1
*/
- ehprop("http://stanbol.apache.org/ontology/enhancementproperties#";)
+ ehp("http://stanbol.apache.org/ontology/enhancementproperties#";)
;
String ns;
Modified:
stanbol/branches/release-0.12/enhancer/generic/servicesapi/src/test/java/org/apache/stanbol/enhancer/serviceapi/helper/EnhancementEngineHelperTest.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancer/generic/servicesapi/src/test/java/org/apache/stanbol/enhancer/serviceapi/helper/EnhancementEngineHelperTest.java?rev=1596518&r1=1596517&r2=1596518&view=diff
==============================================================================
---
stanbol/branches/release-0.12/enhancer/generic/servicesapi/src/test/java/org/apache/stanbol/enhancer/serviceapi/helper/EnhancementEngineHelperTest.java
(original)
+++
stanbol/branches/release-0.12/enhancer/generic/servicesapi/src/test/java/org/apache/stanbol/enhancer/serviceapi/helper/EnhancementEngineHelperTest.java
Wed May 21 09:22:31 2014
@@ -16,6 +16,10 @@
*/
package org.apache.stanbol.enhancer.serviceapi.helper;
+import java.math.BigInteger;
+import java.util.Arrays;
+import java.util.Collection;
+
import org.apache.clerezza.rdf.core.Language;
import org.apache.clerezza.rdf.core.LiteralFactory;
import org.apache.clerezza.rdf.core.MGraph;
@@ -114,6 +118,133 @@ public class EnhancementEngineHelperTest
Assert.assertNull(EnhancementEngineHelper.getString(
metadata, ta,Properties.ENHANCER_SELECTION_TAIL));
}
+ /**
+ * Tests positive cases for {@link
EnhancementEngineHelper#getConfigValues(Object, Class, boolean)}
+ */
+ @Test
+ public void testConfigValues(){
+ Object value = new String[]{"23","27.25","-23"};
+ Assert.assertEquals(
+
Arrays.asList(Float.valueOf(23),Float.valueOf(27.25f),Float.valueOf(-23)),
+ EnhancementEngineHelper.getConfigValues(value, Float.class));
+ Assert.assertEquals(
+
Arrays.asList(Double.valueOf(23),Double.valueOf(27.25f),Double.valueOf(-23)),
+ EnhancementEngineHelper.getConfigValues(value, Double.class));
+ Assert.assertEquals(
+ Arrays.asList("23","27.25","-23"),
+ EnhancementEngineHelper.getConfigValues(value, String.class));
+
+ value = new float[]{23f,27.25f,-23f};
+ Assert.assertEquals(
+
Arrays.asList(Float.valueOf(23),Float.valueOf(27.25f),Float.valueOf(-23)),
+ EnhancementEngineHelper.getConfigValues(value, Float.class));
+ Assert.assertEquals(
+
Arrays.asList(Double.valueOf(23),Double.valueOf(27.25f),Double.valueOf(-23)),
+ EnhancementEngineHelper.getConfigValues(value, Double.class));
+ Assert.assertEquals(
+ Arrays.asList("23.0","27.25","-23.0"),
+ EnhancementEngineHelper.getConfigValues(value, String.class));
+
+
+ value = new String[]{"23","27.25",null,"-23"};
+ Assert.assertEquals(
+
Arrays.asList(Float.valueOf(23),Float.valueOf(27.25f),Float.valueOf(-23)),
+ EnhancementEngineHelper.getConfigValues(value, Float.class));
+ Assert.assertEquals(
+
Arrays.asList(Float.valueOf(23),Float.valueOf(27.25f),null,Float.valueOf(-23)),
+ EnhancementEngineHelper.getConfigValues(value, Float.class,true));
+
+ value = "23";
+ Assert.assertEquals(Arrays.asList(Integer.valueOf(23)),
+ EnhancementEngineHelper.getConfigValues(value, Integer.class));
+ Assert.assertEquals(Arrays.asList(Float.valueOf(23)),
+ EnhancementEngineHelper.getConfigValues(value, Float.class));
+ Assert.assertEquals(Arrays.asList("23"),
+ EnhancementEngineHelper.getConfigValues(value, String.class));
+
+ value = null;
+ Assert.assertNull(EnhancementEngineHelper.getConfigValues(value,
String.class));
+ Assert.assertNull(EnhancementEngineHelper.getConfigValues(value,
Double.class));
+ }
+
+ /**
+ * Tests positive cases for {@link
EnhancementEngineHelper#getFirstConfigValue(Object, Class)}
+ */
+ @Test
+ public void testFirstConfigValue(){
+ Object value = null;
+ Assert.assertNull(EnhancementEngineHelper.getFirstConfigValue(value,
String.class));
+ Assert.assertNull(EnhancementEngineHelper.getFirstConfigValue(value,
Double.class));
+
+ value = new String[]{null};
+ Assert.assertNull(EnhancementEngineHelper.getFirstConfigValue(value,
String.class));
+ Assert.assertNull(EnhancementEngineHelper.getFirstConfigValue(value,
Double.class));
+
+ value = new String[]{null,null,null};
+ Assert.assertNull(EnhancementEngineHelper.getFirstConfigValue(value,
String.class));
+ Assert.assertNull(EnhancementEngineHelper.getFirstConfigValue(value,
Double.class));
+
+ value = Arrays.asList((String)null);
+ Assert.assertNull(EnhancementEngineHelper.getFirstConfigValue(value,
String.class));
+ Assert.assertNull(EnhancementEngineHelper.getFirstConfigValue(value,
Double.class));
+
+ value = Arrays.asList(null,null,null);
+ Assert.assertNull(EnhancementEngineHelper.getFirstConfigValue(value,
String.class));
+ Assert.assertNull(EnhancementEngineHelper.getFirstConfigValue(value,
Double.class));
+
+ value = "23";
+ Assert.assertEquals("23",
EnhancementEngineHelper.getFirstConfigValue(value, String.class));
+ Assert.assertEquals(Integer.valueOf(23),
EnhancementEngineHelper.getFirstConfigValue(value, Integer.class));
+ Assert.assertEquals(Double.valueOf(23),
EnhancementEngineHelper.getFirstConfigValue(value, Double.class));
+ Assert.assertEquals(BigInteger.valueOf(23),
EnhancementEngineHelper.getFirstConfigValue(value, BigInteger.class));
+
+ value = new String[]{"23"};
+ Assert.assertEquals("23",
EnhancementEngineHelper.getFirstConfigValue(value, String.class));
+ Assert.assertEquals(Integer.valueOf(23),
EnhancementEngineHelper.getFirstConfigValue(value, Integer.class));
+ Assert.assertEquals(Double.valueOf(23),
EnhancementEngineHelper.getFirstConfigValue(value, Double.class));
+ Assert.assertEquals(BigInteger.valueOf(23),
EnhancementEngineHelper.getFirstConfigValue(value, BigInteger.class));
+
+ value = new int[]{23};
+ Assert.assertEquals("23",
EnhancementEngineHelper.getFirstConfigValue(value, String.class));
+ Assert.assertEquals(Integer.valueOf(23),
EnhancementEngineHelper.getFirstConfigValue(value, Integer.class));
+ Assert.assertEquals(Double.valueOf(23),
EnhancementEngineHelper.getFirstConfigValue(value, Double.class));
+ Assert.assertEquals(BigInteger.valueOf(23),
EnhancementEngineHelper.getFirstConfigValue(value, BigInteger.class));
+
+ value = new String[]{"23","24"};
+ Assert.assertEquals("23",
EnhancementEngineHelper.getFirstConfigValue(value, String.class));
+ Assert.assertEquals(Integer.valueOf(23),
EnhancementEngineHelper.getFirstConfigValue(value, Integer.class));
+ Assert.assertEquals(Double.valueOf(23),
EnhancementEngineHelper.getFirstConfigValue(value, Double.class));
+ Assert.assertEquals(BigInteger.valueOf(23),
EnhancementEngineHelper.getFirstConfigValue(value, BigInteger.class));
+
+ value = new int[]{23, 24};
+ Assert.assertEquals("23",
EnhancementEngineHelper.getFirstConfigValue(value, String.class));
+ Assert.assertEquals(Integer.valueOf(23),
EnhancementEngineHelper.getFirstConfigValue(value, Integer.class));
+ Assert.assertEquals(Double.valueOf(23),
EnhancementEngineHelper.getFirstConfigValue(value, Double.class));
+ Assert.assertEquals(BigInteger.valueOf(23),
EnhancementEngineHelper.getFirstConfigValue(value, BigInteger.class));
+
+ value = new String[]{null,"23"};
+ Assert.assertEquals("23",
EnhancementEngineHelper.getFirstConfigValue(value, String.class));
+ Assert.assertEquals(Integer.valueOf(23),
EnhancementEngineHelper.getFirstConfigValue(value, Integer.class));
+ Assert.assertEquals(Double.valueOf(23),
EnhancementEngineHelper.getFirstConfigValue(value, Double.class));
+ Assert.assertEquals(BigInteger.valueOf(23),
EnhancementEngineHelper.getFirstConfigValue(value, BigInteger.class));
+
+ value = Arrays.asList("23");
+ Assert.assertEquals("23",
EnhancementEngineHelper.getFirstConfigValue(value, String.class));
+ Assert.assertEquals(Integer.valueOf(23),
EnhancementEngineHelper.getFirstConfigValue(value, Integer.class));
+ Assert.assertEquals(Double.valueOf(23),
EnhancementEngineHelper.getFirstConfigValue(value, Double.class));
+ Assert.assertEquals(BigInteger.valueOf(23),
EnhancementEngineHelper.getFirstConfigValue(value, BigInteger.class));
+
+ value = Arrays.asList("23","24");
+ Assert.assertEquals("23",
EnhancementEngineHelper.getFirstConfigValue(value, String.class));
+ Assert.assertEquals(Integer.valueOf(23),
EnhancementEngineHelper.getFirstConfigValue(value, Integer.class));
+ Assert.assertEquals(Double.valueOf(23),
EnhancementEngineHelper.getFirstConfigValue(value, Double.class));
+ Assert.assertEquals(BigInteger.valueOf(23),
EnhancementEngineHelper.getFirstConfigValue(value, BigInteger.class));
+
+ value = Arrays.asList(null,"23");
+ Assert.assertEquals("23",
EnhancementEngineHelper.getFirstConfigValue(value, String.class));
+ Assert.assertEquals(Integer.valueOf(23),
EnhancementEngineHelper.getFirstConfigValue(value, Integer.class));
+ Assert.assertEquals(Double.valueOf(23),
EnhancementEngineHelper.getFirstConfigValue(value, Double.class));
+ Assert.assertEquals(BigInteger.valueOf(23),
EnhancementEngineHelper.getFirstConfigValue(value, BigInteger.class));
+ }
-
}
Modified:
stanbol/branches/release-0.12/enhancer/generic/servicesapi/src/test/java/org/apache/stanbol/enhancer/serviceapi/helper/EnhancementPropertyTest.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancer/generic/servicesapi/src/test/java/org/apache/stanbol/enhancer/serviceapi/helper/EnhancementPropertyTest.java?rev=1596518&r1=1596517&r2=1596518&view=diff
==============================================================================
---
stanbol/branches/release-0.12/enhancer/generic/servicesapi/src/test/java/org/apache/stanbol/enhancer/serviceapi/helper/EnhancementPropertyTest.java
(original)
+++
stanbol/branches/release-0.12/enhancer/generic/servicesapi/src/test/java/org/apache/stanbol/enhancer/serviceapi/helper/EnhancementPropertyTest.java
Wed May 21 09:22:31 2014
@@ -349,8 +349,8 @@ public class EnhancementPropertyTest {
Collection<String> derefernceLanguages = Arrays.asList("en","de");
Integer maxSuggestions = Integer.valueOf(5);
- UriRef maxSuggestionsProperty = new UriRef(NamespaceEnum.ehprop +
PROPERTY_MAX_SUGGESTIONS);
- UriRef dereferenceLanguagesProperty = new UriRef(NamespaceEnum.ehprop
+ PROPERTY_DEREFERENCE_LANGUAGES);
+ UriRef maxSuggestionsProperty = new UriRef(NamespaceEnum.ehp +
PROPERTY_MAX_SUGGESTIONS);
+ UriRef dereferenceLanguagesProperty = new UriRef(NamespaceEnum.ehp +
PROPERTY_DEREFERENCE_LANGUAGES);
//set up the map with the enhancement properties we want to set for the
//Enhancement Chain
Modified:
stanbol/branches/release-0.12/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/reader/ContentItemReader.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/reader/ContentItemReader.java?rev=1596518&r1=1596517&r2=1596518&view=diff
==============================================================================
---
stanbol/branches/release-0.12/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/reader/ContentItemReader.java
(original)
+++
stanbol/branches/release-0.12/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/reader/ContentItemReader.java
Wed May 21 09:22:31 2014
@@ -17,9 +17,10 @@
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.RequestPropertiesHelper.ENHANCEMENT_PROPERTIES_URI;
+import static
org.apache.stanbol.enhancer.jersey.utils.RequestPropertiesHelper.REQUEST_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 static
org.apache.stanbol.enhancer.servicesapi.rdf.Properties.DC_LANGUAGE;
import java.io.IOException;
import java.io.InputStream;
@@ -41,6 +42,7 @@ import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.Response;
@@ -49,6 +51,8 @@ import javax.ws.rs.ext.Provider;
import org.apache.clerezza.rdf.core.MGraph;
import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.clerezza.rdf.core.impl.PlainLiteralImpl;
+import org.apache.clerezza.rdf.core.impl.TripleImpl;
import org.apache.clerezza.rdf.core.serializedform.Parser;
import org.apache.commons.fileupload.FileItemIterator;
import org.apache.commons.fileupload.FileItemStream;
@@ -56,13 +60,16 @@ import org.apache.commons.fileupload.Fil
import org.apache.commons.fileupload.FileUploadException;
import org.apache.commons.fileupload.RequestContext;
import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.stanbol.commons.indexedgraph.IndexedMGraph;
import org.apache.stanbol.commons.web.base.ContextHelper;
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.helper.EnhancementEngineHelper;
import org.apache.stanbol.enhancer.servicesapi.impl.StreamSource;
+import org.apache.stanbol.enhancer.servicesapi.rdf.Properties;
import org.codehaus.jettison.json.JSONArray;
import org.codehaus.jettison.json.JSONException;
import org.codehaus.jettison.json.JSONObject;
@@ -179,7 +186,7 @@ public class ContentItemReader implement
} else if(fis.getFieldName().equals("content")){
contentItem = createContentItem(contentItemId,
metadata, fis, parsedContentIds);
} else if(fis.getFieldName().equals("properties") ||
-
fis.getFieldName().equals(ENHANCEMENT_PROPERTIES_URI.getUnicodeString())){
+
fis.getFieldName().equals(REQUEST_PROPERTIES_URI.getUnicodeString())){
//parse the RequestProperties
if(contentItem == null){
throw new WebApplicationException(
@@ -267,10 +274,16 @@ public class ContentItemReader implement
//add the URI of the main content
parsedContentIds.add(contentItem.getPartUri(0).getUnicodeString());
}
- //set the parsed contentIDs to the EnhancementProperties
+ //STANBOL-660: set the parsed contentIDs to the EnhancementProperties
Map<String,Object> ep =
ContentItemHelper.initRequestPropertiesContentPart(contentItem);
parseEnhancementPropertiesFromParameters(ep);
ep.put(PARSED_CONTENT_URIS,
Collections.unmodifiableSet(parsedContentIds));
+ //finally set the language of the content if explicitly parsed in the
request
+ String contentLanguage = getContentLanguage();
+ if(!StringUtils.isBlank(contentLanguage)){
+ EnhancementEngineHelper.set(contentItem.getMetadata(),
contentItem.getUri(),
+ DC_LANGUAGE, new PlainLiteralImpl(contentLanguage));
+ }
return contentItem;
}
/**
@@ -283,6 +296,14 @@ public class ContentItemReader implement
String ciUri = request == null ? null : request.getParameter("uri");
return ciUri == null ? null : new UriRef(ciUri);
}
+ /**
+ * Getter for the <code>Content-Language</code> header
+ * @return the language of the content as parsed in the request or
+ * <code>null</code> if the header is not present.
+ */
+ private String getContentLanguage(){
+ return request == null ? null :
request.getHeader(HttpHeaders.CONTENT_LANGUAGE);
+ }
/**
* Parsed EnhancementProperties from the request parameters. <p>
Modified:
stanbol/branches/release-0.12/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/utils/EnhancementPropertiesHelper.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/utils/EnhancementPropertiesHelper.java?rev=1596518&r1=1596517&r2=1596518&view=diff
==============================================================================
---
stanbol/branches/release-0.12/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/utils/EnhancementPropertiesHelper.java
(original)
+++
stanbol/branches/release-0.12/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/utils/EnhancementPropertiesHelper.java
Wed May 21 09:22:31 2014
@@ -41,11 +41,17 @@ public final class EnhancementProperties
private EnhancementPropertiesHelper(){/* no instances allowed*/}
/**
- * @see ContentItemHelper#ENHANCEMENT_PROPERTIES_URI
- * @deprecated use {@link
RequestPropertiesHelper#ENHANCEMENT_PROPERTIES_URI}
+ *
+ * @see ContentItemHelper#REQUEST_PROPERTIES_URI
+ * @deprecated use {@link RequestPropertiesHelper#REQUEST_PROPERTIES_URI}.
+ * <b>NOTE</b> this URI has changed with <code>0.12.1</code> from
+ * <code>urn:apache.org:stanbol.web:enhancement.properties</code> to
+ * <code>urn:apache.org:stanbol.enhancer:request.properties</code>. The
+ * {@link #getEnhancementProperties(ContentItem)} support content parts
+ * registered with both URIs.
*/
public static final UriRef ENHANCEMENT_PROPERTIES_URI =
- RequestPropertiesHelper.ENHANCEMENT_PROPERTIES_URI;
+ RequestPropertiesHelper.REQUEST_PROPERTIES_URI;
/**
* Boolean switch parsed as {@link QueryParam} tha allows to deactivate the
* inclusion of the {@link ContentItem#getMetadata()} in the Response
Modified:
stanbol/branches/release-0.12/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/utils/RequestPropertiesHelper.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/utils/RequestPropertiesHelper.java?rev=1596518&r1=1596517&r2=1596518&view=diff
==============================================================================
---
stanbol/branches/release-0.12/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/utils/RequestPropertiesHelper.java
(original)
+++
stanbol/branches/release-0.12/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/utils/RequestPropertiesHelper.java
Wed May 21 09:22:31 2014
@@ -41,10 +41,10 @@ public final class RequestPropertiesHelp
private RequestPropertiesHelper(){/* no instances allowed*/}
/**
- * @see ContentItemHelper#ENHANCEMENT_PROPERTIES_URI
+ * @see ContentItemHelper#REQUEST_PROPERTIES_URI
*/
- public static final UriRef ENHANCEMENT_PROPERTIES_URI =
- ContentItemHelper.ENHANCEMENT_PROPERTIES_URI;
+ public static final UriRef REQUEST_PROPERTIES_URI =
+ ContentItemHelper.REQUEST_PROPERTIES_URI;
/**
* Boolean switch parsed as {@link QueryParam} tha allows to deactivate the
* inclusion of the {@link ContentItem#getMetadata()} in the Response
@@ -57,7 +57,7 @@ public final class RequestPropertiesHelp
* returned set contains '*' than all such content parts need to be
returned.<p>
* NOTE: This can also be used to include the Request Properties
* as "applciation/json" in the Response by adding this
- * {@link RequestPropertiesHelper#ENHANCEMENT_PROPERTIES_URI uri}.
+ * {@link RequestPropertiesHelper#REQUEST_PROPERTIES_URI uri}.
*/
public static final String OUTPUT_CONTENT_PART =
"stanbol.enhancer.web.outputContentPart";
/**
Modified:
stanbol/branches/release-0.12/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/writers/ContentItemWriter.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/writers/ContentItemWriter.java?rev=1596518&r1=1596517&r2=1596518&view=diff
==============================================================================
---
stanbol/branches/release-0.12/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/writers/ContentItemWriter.java
(original)
+++
stanbol/branches/release-0.12/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/writers/ContentItemWriter.java
Wed May 21 09:22:31 2014
@@ -20,7 +20,7 @@ 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.RequestPropertiesHelper.ENHANCEMENT_PROPERTIES_URI;
+import static
org.apache.stanbol.enhancer.jersey.utils.RequestPropertiesHelper.REQUEST_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;
@@ -267,7 +267,7 @@ public class ContentItemWriter implement
if(includeContentParts != null){
//(4) serialise the Request Properties
if(includeContentParts.isEmpty() ||
includeContentParts.contains(
- ENHANCEMENT_PROPERTIES_URI.getUnicodeString())) {
+ REQUEST_PROPERTIES_URI.getUnicodeString())) {
JSONObject object;
try {
object = toJson(reqProp);
@@ -278,7 +278,7 @@ public class ContentItemWriter implement
"JSON (values :
"+reqProp+")!").build());
}
entity.addBodyPart(new FormBodyPart(
- ENHANCEMENT_PROPERTIES_URI.getUnicodeString(),
+ REQUEST_PROPERTIES_URI.getUnicodeString(),
new
StringBody(object.toString(),MediaType.APPLICATION_JSON,UTF8)));
}
//(5) additional RDF metadata stored in contentParts
Modified:
stanbol/branches/release-0.12/enhancer/jersey/src/test/java/org/apache/stanbol/enhancer/jersey/ContentItemReaderWriterTest.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancer/jersey/src/test/java/org/apache/stanbol/enhancer/jersey/ContentItemReaderWriterTest.java?rev=1596518&r1=1596517&r2=1596518&view=diff
==============================================================================
---
stanbol/branches/release-0.12/enhancer/jersey/src/test/java/org/apache/stanbol/enhancer/jersey/ContentItemReaderWriterTest.java
(original)
+++
stanbol/branches/release-0.12/enhancer/jersey/src/test/java/org/apache/stanbol/enhancer/jersey/ContentItemReaderWriterTest.java
Wed May 21 09:22:31 2014
@@ -16,7 +16,7 @@
*/
package org.apache.stanbol.enhancer.jersey;
-import static
org.apache.stanbol.enhancer.jersey.utils.RequestPropertiesHelper.ENHANCEMENT_PROPERTIES_URI;
+import static
org.apache.stanbol.enhancer.jersey.utils.RequestPropertiesHelper.REQUEST_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;
@@ -184,7 +184,7 @@ public class ContentItemReaderWriterTest
"This is a ContentItem to Mime Multipart test!",
"--contentParts--",
"--"+contentType.getParameters().get("boundary"),
- "Content-Disposition: form-data;
name=\""+ENHANCEMENT_PROPERTIES_URI.getUnicodeString()+"\"",
+ "Content-Disposition: form-data;
name=\""+REQUEST_PROPERTIES_URI.getUnicodeString()+"\"",
"Content-Type: application/json; charset=UTF-8",
"--"+contentType.getParameters().get("boundary"),
"Content-Disposition: form-data;
name=\""+CHAIN_EXECUTION.getUnicodeString()+"\"",
