Author: bblfish
Date: Fri Jul 8 13:49:30 2011
New Revision: 1144313
URL: http://svn.apache.org/viewvc?rev=1144313&view=rev
Log:
CLEREZZA-598: fixed long to integer conversion - and reduce a bit of code
duplication of final URIs
Modified:
incubator/clerezza/trunk/parent/rdf.core/src/main/java/org/apache/clerezza/rdf/core/impl/SimpleLiteralFactory.java
incubator/clerezza/trunk/parent/rdf.core/src/test/java/org/apache/clerezza/rdf/core/LiteralFactoryTest.java
incubator/clerezza/trunk/parent/rdf.core/src/test/java/org/apache/clerezza/rdf/core/impl/SimpleLiteralFactoryTest.java
Modified:
incubator/clerezza/trunk/parent/rdf.core/src/main/java/org/apache/clerezza/rdf/core/impl/SimpleLiteralFactory.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/rdf.core/src/main/java/org/apache/clerezza/rdf/core/impl/SimpleLiteralFactory.java?rev=1144313&r1=1144312&r2=1144313&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/rdf.core/src/main/java/org/apache/clerezza/rdf/core/impl/SimpleLiteralFactory.java
(original)
+++
incubator/clerezza/trunk/parent/rdf.core/src/main/java/org/apache/clerezza/rdf/core/impl/SimpleLiteralFactory.java
Fri Jul 8 13:49:30 2011
@@ -44,14 +44,12 @@ import org.apache.clerezza.rdf.core.impl
public class SimpleLiteralFactory extends LiteralFactory {
- final private static UriRef xsdInteger =
- new UriRef("http://www.w3.org/2001/XMLSchema#integer";);
- final private static UriRef xsdInt =
- new UriRef("http://www.w3.org/2001/XMLSchema#int";);
- final private static UriRef xsdShort =
- new UriRef("http://www.w3.org/2001/XMLSchema#short";);
- final private static UriRef xsdByte =
- new UriRef("http://www.w3.org/2001/XMLSchema#byte";);
+ private static final String XSD = "http://www.w3.org/2001/XMLSchema#";;
+ final private static UriRef xsdInteger = xsd("integer");
+ final private static UriRef xsdInt = xsd("int");
+ final private static UriRef xsdShort = xsd("short");
+ final private static UriRef xsdByte = xsd("byte");
+ final private static UriRef xsdLong = xsd("long");
final private static Set<UriRef> decimalTypes = new HashSet<UriRef>();
@@ -60,7 +58,7 @@ public class SimpleLiteralFactory extend
final static Class<? extends byte[]> byteArrayType;
static {
- Collections.addAll(decimalTypes, xsdInteger, xsdInt, xsdByte,
xsdShort);
+ Collections.addAll(decimalTypes, xsdInteger, xsdInt, xsdByte,
xsdShort, xsdLong );
byte[] byteArray = new byte[0];
byteArrayType = byteArray.getClass();
@@ -75,11 +73,12 @@ public class SimpleLiteralFactory extend
typeConverterMap.put(UriRef.class, new UriRefConverter());
}
- final private static UriRef xsdDouble =
- new UriRef("http://www.w3.org/2001/XMLSchema#double";);
- final private static UriRef xsdAnyURI =
- new UriRef("http://www.w3.org/2001/XMLSchema#anyURI";);
+ final private static UriRef xsdDouble =xsd("double");
+ final private static UriRef xsdAnyURI =xsd("anyURI");
+ final private static UriRef xsd(String name) {
+ return new UriRef(XSD+name);
+ }
private static interface TypeConverter<T> {
TypedLiteral createTypedLiteral(T value);
@@ -88,8 +87,7 @@ public class SimpleLiteralFactory extend
private static class ByteArrayConverter implements
TypeConverter<byte[]> {
- private static final UriRef base64Uri =
- new
UriRef("http://www.w3.org/2001/XMLSchema#base64Binary";);
+ private static final UriRef base64Uri =xsd("base64Binary");
@Override
public TypedLiteral createTypedLiteral(byte[] value) {
@@ -108,8 +106,7 @@ public class SimpleLiteralFactory extend
}
private static class DateConverter implements TypeConverter<Date> {
- private static final UriRef dateTimeUri =
- new UriRef("http://www.w3.org/2001/XMLSchema#dateTime";);
+ private static final UriRef dateTimeUri =xsd("dateTime");
private static final DateFormat DATE_FORMAT = new
W3CDateFormat();
@Override
@@ -134,8 +131,7 @@ public class SimpleLiteralFactory extend
private static class BooleanConverter implements TypeConverter<Boolean>
{
- private static final UriRef booleanUri =
- new UriRef("http://www.w3.org/2001/XMLSchema#boolean";);
+ private static final UriRef booleanUri =xsd("boolean");
public static final TypedLiteralImpl TRUE = new
TypedLiteralImpl("true", booleanUri);
public static final TypedLiteralImpl FALSE = new
TypedLiteralImpl("false", booleanUri);
@@ -158,8 +154,7 @@ public class SimpleLiteralFactory extend
private static class StringConverter implements TypeConverter<String> {
- private static final UriRef stringUri =
- new UriRef("http://www.w3.org/2001/XMLSchema#string";);
+ private static final UriRef stringUri =xsd("string");
@Override
public TypedLiteral createTypedLiteral(String value) {
@@ -198,7 +193,7 @@ public class SimpleLiteralFactory extend
@Override
public TypedLiteral createTypedLiteral(Long value) {
- return new TypedLiteralImpl(value.toString(),
xsdInteger);
+ return new TypedLiteralImpl(value.toString(), xsdLong);
}
@Override
@@ -210,6 +205,7 @@ public class SimpleLiteralFactory extend
}
}
+
private static class DoubleConverter implements TypeConverter<Double> {
Modified:
incubator/clerezza/trunk/parent/rdf.core/src/test/java/org/apache/clerezza/rdf/core/LiteralFactoryTest.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/rdf.core/src/test/java/org/apache/clerezza/rdf/core/LiteralFactoryTest.java?rev=1144313&r1=1144312&r2=1144313&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/rdf.core/src/test/java/org/apache/clerezza/rdf/core/LiteralFactoryTest.java
(original)
+++
incubator/clerezza/trunk/parent/rdf.core/src/test/java/org/apache/clerezza/rdf/core/LiteralFactoryTest.java
Fri Jul 8 13:49:30 2011
@@ -109,7 +109,7 @@ public class LiteralFactoryTest {
public void longConversion() {
long value = 332314646;
TypedLiteral literal =
LiteralFactory.getInstance().createTypedLiteral(value);
- Assert.assertEquals(new
UriRef("http://www.w3.org/2001/XMLSchema#integer";),
+ Assert.assertEquals(new
UriRef("http://www.w3.org/2001/XMLSchema#long";),
literal.getDataType());
Long valueBack =
LiteralFactory.getInstance().createObject(Long.class, literal);
Assert.assertEquals(value, valueBack.longValue());
Modified:
incubator/clerezza/trunk/parent/rdf.core/src/test/java/org/apache/clerezza/rdf/core/impl/SimpleLiteralFactoryTest.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/rdf.core/src/test/java/org/apache/clerezza/rdf/core/impl/SimpleLiteralFactoryTest.java?rev=1144313&r1=1144312&r2=1144313&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/rdf.core/src/test/java/org/apache/clerezza/rdf/core/impl/SimpleLiteralFactoryTest.java
(original)
+++
incubator/clerezza/trunk/parent/rdf.core/src/test/java/org/apache/clerezza/rdf/core/impl/SimpleLiteralFactoryTest.java
Fri Jul 8 13:49:30 2011
@@ -33,13 +33,16 @@ public class SimpleLiteralFactoryTest {
new UriRef("http://www.w3.org/2001/XMLSchema#integer";);
final private static UriRef xsdInt =
new UriRef("http://www.w3.org/2001/XMLSchema#int";);
+ final private static UriRef xsdLong =
+ new UriRef("http://www.w3.org/2001/XMLSchema#long";);
+
SimpleLiteralFactory simpleLiteralFactory = new SimpleLiteralFactory();
@Test
public void longToXsdIntegerAndBackToMany() {
long value = 14l;
TypedLiteral tl =
simpleLiteralFactory.createTypedLiteral(value);
- Assert.assertEquals(xsdInteger, tl.getDataType());
+ Assert.assertEquals(xsdLong, tl.getDataType());
long longValue = simpleLiteralFactory.createObject(Long.class,
tl);
Assert.assertEquals(value, longValue);
int intValue = simpleLiteralFactory.createObject(Integer.class,
tl);
