Apache
/
olingo-odata4
mirror of https://github.com/apache/olingo-odata4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[OLINGO-690] the server actually supports JSON without metadata 

Change-Id: Ib9289c9e81c05ed404e71bdc1bc7eb7bbdde7a7c

Signed-off-by: Christian Amend <christian.amend@sap.com>
This commit is contained in:
Klaus Straubinger 2015-06-25 10:22:37 +02:00 committed by Christian Amend
parent e32034bd54
commit 94b3917f4e
3 changed files with 124 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ContentType.java
View File

@ -49,21 +49,29 @@ public final class ContentType {
private static final String APPLICATION = "application"; private static final String APPLICATION = "application";
private static final String TEXT = "text"; private static final String TEXT = "text";
private static final String MULTIPART = "multipart"; private static final String MULTIPART = "multipart";
public static final String PARAMETER_CHARSET = "charset";
public static final String PARAMETER_IEEE754_COMPATIBLE = "IEEE754Compatible";
public static final String PARAMETER_ODATA_METADATA = "odata.metadata";
public static final String VALUE_ODATA_METADATA_NONE = "none";
public static final String VALUE_ODATA_METADATA_MINIMAL = "minimal";
public static final String VALUE_ODATA_METADATA_FULL = "full";
public static final ContentType APPLICATION_JSON = new ContentType(APPLICATION, "json", null); public static final ContentType APPLICATION_JSON = new ContentType(APPLICATION, "json", null);
public static final ContentType JSON = ContentType.create(ContentType.APPLICATION_JSON, "odata.metadata=minimal"); public static final ContentType JSON = ContentType.create(ContentType.APPLICATION_JSON,
public static final ContentType JSON_NO_METADATA = ContentType.create(ContentType.APPLICATION_JSON, PARAMETER_ODATA_METADATA + '=' + VALUE_ODATA_METADATA_MINIMAL);
"odata.metadata=none"); public static final ContentType JSON_NO_METADATA = ContentType.create(ContentType.APPLICATION_JSON,
public static final ContentType JSON_FULL_METADATA = ContentType.create(ContentType.APPLICATION_JSON, PARAMETER_ODATA_METADATA + '=' + VALUE_ODATA_METADATA_NONE);
"odata.metadata=full"); public static final ContentType JSON_FULL_METADATA = ContentType.create(ContentType.APPLICATION_JSON,
PARAMETER_ODATA_METADATA + '=' + VALUE_ODATA_METADATA_FULL);
public static final ContentType APPLICATION_XML = new ContentType(APPLICATION, "xml", null); public static final ContentType APPLICATION_XML = new ContentType(APPLICATION, "xml", null);
public static final ContentType APPLICATION_ATOM_XML = new ContentType(APPLICATION, "atom+xml", null); public static final ContentType APPLICATION_ATOM_XML = new ContentType(APPLICATION, "atom+xml", null);
public static final ContentType APPLICATION_ATOM_XML_ENTRY = create(APPLICATION_ATOM_XML, "type=entry"); public static final ContentType APPLICATION_ATOM_XML_ENTRY = create(APPLICATION_ATOM_XML, "type=entry");
public static final ContentType APPLICATION_ATOM_XML_FEED = create(APPLICATION_ATOM_XML, "type=feed"); public static final ContentType APPLICATION_ATOM_XML_FEED = create(APPLICATION_ATOM_XML, "type=feed");
public static final ContentType APPLICATION_ATOM_SVC = new ContentType(APPLICATION, "atomsvc+xml", null); public static final ContentType APPLICATION_ATOM_SVC = new ContentType(APPLICATION, "atomsvc+xml", null);
public static final ContentType APPLICATION_OCTET_STREAM = new ContentType(APPLICATION, "octet-stream", null); public static final ContentType APPLICATION_OCTET_STREAM = new ContentType(APPLICATION, "octet-stream", null);
public static final ContentType APPLICATION_XHTML_XML = new ContentType(APPLICATION, "xhtml+xml", null); public static final ContentType APPLICATION_XHTML_XML = new ContentType(APPLICATION, "xhtml+xml", null);
@ -81,14 +89,6 @@ public final class ContentType {
public static final ContentType MULTIPART_MIXED = new ContentType(MULTIPART, "mixed", null); public static final ContentType MULTIPART_MIXED = new ContentType(MULTIPART, "mixed", null);
public static final ContentType MULTIPART_FORM_DATA = new ContentType(MULTIPART, "form-data", null); public static final ContentType MULTIPART_FORM_DATA = new ContentType(MULTIPART, "form-data", null);
public static final String PARAMETER_CHARSET = "charset";
public static final String PARAMETER_IEEE754_COMPATIBLE = "IEEE754Compatible";
public static final String PARAMETER_ODATA_METADATA = "odata.metadata";
public static final String VALUE_ODATA_METADATA_NONE = "none";
public static final String VALUE_ODATA_METADATA_MINIMAL = "minimal";
public static final String VALUE_ODATA_METADATA_FULL = "full";
private final String type; private final String type;
private final String subtype; private final String subtype;
private final Map<String, String> parameters; private final Map<String, String> parameters;
@ -255,7 +255,7 @@ public final class ContentType {
public Map<String, String> getParameters() { public Map<String, String> getParameters() {
return Collections.unmodifiableMap(parameters); return Collections.unmodifiableMap(parameters);
} }
/** /**
* Returns the value of a given parameter. * Returns the value of a given parameter.
* If the parameter does not exists the method returns null * If the parameter does not exists the method returns null
@ -266,7 +266,7 @@ public final class ContentType {
public String getParameter(final String name) { public String getParameter(final String name) {
return parameters.get(name); return parameters.get(name);
} }
@Override @Override
public int hashCode() { public int hashCode() {
return 1; return 1;
@ -323,7 +323,7 @@ public final class ContentType {
public boolean isCompatible(final ContentType other) { public boolean isCompatible(final ContentType other) {
return type.equalsIgnoreCase(other.type) && subtype.equalsIgnoreCase(other.subtype); return type.equalsIgnoreCase(other.type) && subtype.equalsIgnoreCase(other.subtype);
} }
/** /**
* <p>{@link ContentType}s are <b>compatible</b> * <p>{@link ContentType}s are <b>compatible</b>
* if <code>type</code> and <code>subtype</code> have the same value.</p> * if <code>type</code> and <code>subtype</code> have the same value.</p>
@ -331,16 +331,16 @@ public final class ContentType {
* (for compare with parameters see {@link #equals(Object)}).</p> * (for compare with parameters see {@link #equals(Object)}).</p>
* @return <code>true</code> if both instances are compatible (see definition above), otherwise <code>false</code>. * @return <code>true</code> if both instances are compatible (see definition above), otherwise <code>false</code>.
*/ */
public boolean isCompatible(final ContentType...otherTypes) { public boolean isCompatible(final ContentType... otherTypes) {
for(final ContentType otherType : otherTypes) { for (final ContentType otherType : otherTypes) {
if(isCompatible(otherType)) { if (isCompatible(otherType)) {
return true; return true;
} }
} }
return false; return false;
} }
/** /**
* Checks whether both strings are equal ignoring the case of the strings. * Checks whether both strings are equal ignoring the case of the strings.
* *

153
lib/server-core/src/main/java/org/apache/olingo/server/core/ODataImpl.java
View File

@ -51,99 +51,92 @@ import org.apache.olingo.server.core.uri.UriHelperImpl;
public class ODataImpl extends OData { public class ODataImpl extends OData {
@Override @Override
public ODataSerializer createSerializer(final ContentType contentType) public ODataSerializer createSerializer(final ContentType contentType) throws SerializerException {
throws SerializerException { ODataSerializer serializer = null;
ODataSerializer serializer;
// odata.metadata=none, odata.metadata=minimal, odata.metadata=full if (contentType.isCompatible(ContentType.APPLICATION_JSON)) {
if (contentType.isCompatible(ContentType.APPLICATION_JSON) final String metadata = contentType.getParameter(ContentType.PARAMETER_ODATA_METADATA);
&& ContentType.VALUE_ODATA_METADATA_MINIMAL if (metadata == null
.equals(contentType.getParameter(ContentType.PARAMETER_ODATA_METADATA))) { || ContentType.VALUE_ODATA_METADATA_MINIMAL.equals(metadata)
serializer = new ODataJsonSerializer(contentType); || ContentType.VALUE_ODATA_METADATA_NONE.equals(metadata)) {
} else if (contentType.isCompatible(ContentType.APPLICATION_XML)) { serializer = new ODataJsonSerializer(contentType);
serializer = new ODataXmlSerializerImpl(); }
} else { } else if (contentType.isCompatible(ContentType.APPLICATION_XML)) {
throw new SerializerException("Unsupported format: " serializer = new ODataXmlSerializerImpl();
+ contentType.toContentTypeString(), }
SerializerException.MessageKeys.UNSUPPORTED_FORMAT,
contentType.toContentTypeString());
}
return serializer; if (serializer == null) {
} throw new SerializerException("Unsupported format: " + contentType.toContentTypeString(),
SerializerException.MessageKeys.UNSUPPORTED_FORMAT, contentType.toContentTypeString());
} else {
return serializer;
}
}
@Override @Override
public FixedFormatSerializer createFixedFormatSerializer() { public FixedFormatSerializer createFixedFormatSerializer() {
return new FixedFormatSerializerImpl(); return new FixedFormatSerializerImpl();
} }
@Override @Override
public ODataHttpHandler createHandler(final ServiceMetadata edm) { public ODataHttpHandler createHandler(final ServiceMetadata edm) {
return new ODataHttpHandlerImpl(this, edm); return new ODataHttpHandlerImpl(this, edm);
} }
@Override @Override
public ServiceMetadata createServiceMetadata( public ServiceMetadata createServiceMetadata(final CsdlEdmProvider edmProvider,
final CsdlEdmProvider edmProvider, final List<EdmxReference> references) {
final List<EdmxReference> references) { return createServiceMetadata(edmProvider, references, null);
return createServiceMetadata(edmProvider, references, null); }
}
@Override @Override
public ServiceMetadata createServiceMetadata(CsdlEdmProvider edmProvider, public ServiceMetadata createServiceMetadata(final CsdlEdmProvider edmProvider,
List<EdmxReference> references, final List<EdmxReference> references, final ServiceMetadataETagSupport serviceMetadataETagSupport) {
ServiceMetadataETagSupport serviceMetadataETagSupport) { return new ServiceMetadataImpl(edmProvider, references, serviceMetadataETagSupport);
return new ServiceMetadataImpl(edmProvider, references, }
serviceMetadataETagSupport);
}
@Override @Override
public FixedFormatDeserializer createFixedFormatDeserializer() { public FixedFormatDeserializer createFixedFormatDeserializer() {
return new FixedFormatDeserializerImpl(); return new FixedFormatDeserializerImpl();
} }
@Override @Override
public UriHelper createUriHelper() { public UriHelper createUriHelper() {
return new UriHelperImpl(); return new UriHelperImpl();
} }
@Override @Override
public ODataDeserializer createDeserializer(final ContentType contentType) public ODataDeserializer createDeserializer(final ContentType contentType) throws DeserializerException {
throws DeserializerException { ODataDeserializer deserializer;
ODataDeserializer deserializer;
// odata.metadata=none, odata.metadata=minimal, odata.metadata=full if (contentType.isCompatible(ContentType.JSON)) {
if (contentType.isCompatible(ContentType.JSON)) { deserializer = new ODataJsonDeserializer(contentType);
deserializer = new ODataJsonDeserializer(contentType); // } else if(contentType.isCompatible(ContentType.APPLICATION_XML))
// } else if(contentType.isCompatible(ContentType.APPLICATION_XML)) // We do not support XML deserialization right now so this must lead
// We do not support XML deserialization right now so this must lead // to an error.
// to an error. // {
// { } else {
} else { throw new DeserializerException("Unsupported format: " + contentType.toContentTypeString(),
throw new DeserializerException("Unsupported format: " DeserializerException.MessageKeys.UNSUPPORTED_FORMAT, contentType.toContentTypeString());
+ contentType.toContentTypeString(), }
DeserializerException.MessageKeys.UNSUPPORTED_FORMAT,
contentType.toContentTypeString());
}
return deserializer; return deserializer;
} }
@Override @Override
public EdmPrimitiveType createPrimitiveTypeInstance( public EdmPrimitiveType createPrimitiveTypeInstance(final EdmPrimitiveTypeKind kind) {
final EdmPrimitiveTypeKind kind) { return EdmPrimitiveTypeFactory.getInstance(kind);
return EdmPrimitiveTypeFactory.getInstance(kind); }
}
@Override @Override
public ETagHelper createETagHelper() { public ETagHelper createETagHelper() {
return new ETagHelperImpl(); return new ETagHelperImpl();
} }
@Override @Override
public Preferences createPreferences(final Collection<String> preferHeaders) { public Preferences createPreferences(final Collection<String> preferHeaders) {
return new PreferencesImpl(preferHeaders); return new PreferencesImpl(preferHeaders);
} }
} }

55
lib/server-core/src/test/java/org/apache/olingo/server/core/ODataImplTest.java
View File

@ -23,36 +23,35 @@ import static org.junit.Assert.assertNotNull;
import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.commons.api.format.ContentType;
import org.apache.olingo.server.api.OData; import org.apache.olingo.server.api.OData;
import org.apache.olingo.server.api.deserializer.DeserializerException; import org.apache.olingo.server.api.deserializer.DeserializerException;
import org.apache.olingo.server.api.deserializer.ODataDeserializer;
import org.apache.olingo.server.api.serializer.ODataSerializer;
import org.apache.olingo.server.api.serializer.SerializerException; import org.apache.olingo.server.api.serializer.SerializerException;
import org.junit.Test; import org.junit.Test;
public class ODataImplTest { public class ODataImplTest {
private final OData odata = OData.newInstance(); private final OData odata = OData.newInstance();
@Test(expected=SerializerException.class) @Test
public void testJsonSerializerForOdataMetadataNone() throws SerializerException { public void serializerSupportedFormats() throws SerializerException {
odata.createSerializer(ContentType.JSON_NO_METADATA); assertNotNull(odata.createSerializer(ContentType.JSON_NO_METADATA));
} assertNotNull(odata.createSerializer(ContentType.JSON));
assertNotNull(odata.createSerializer(ContentType.APPLICATION_JSON));
@Test(expected=SerializerException.class) }
public void testJsonSerializerForODataMetadataFull() throws SerializerException {
odata.createSerializer(ContentType.JSON_FULL_METADATA); @Test(expected = SerializerException.class)
} public void jsonSerializerForODataMetadataFull() throws SerializerException {
odata.createSerializer(ContentType.JSON_FULL_METADATA);
@Test }
public void testCreateJsonSerializerForODataMetadataMinimal() throws SerializerException {
final ODataSerializer serializer = odata.createSerializer(ContentType.JSON); @Test
public void deserializerSupportedFormats() throws DeserializerException {
assertNotNull(serializer); assertNotNull(odata.createDeserializer(ContentType.JSON_NO_METADATA));
} assertNotNull(odata.createDeserializer(ContentType.JSON));
assertNotNull(odata.createDeserializer(ContentType.JSON_FULL_METADATA));
@Test assertNotNull(odata.createDeserializer(ContentType.APPLICATION_JSON));
public void testCreateJsonDeserialierForODataMetadataMinimal() throws DeserializerException { }
final ODataDeserializer deserializer = odata.createDeserializer(ContentType.JSON);
@Test(expected = DeserializerException.class)
assertNotNull(deserializer); public void xmlDeserializer() throws DeserializerException {
} odata.createDeserializer(ContentType.APPLICATION_XML);
}
} }