You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2014/09/02 13:49:40 UTC
[20/50] [abbrv] git commit: [OLINGO-165] Remove deprecated variables
and methods
[OLINGO-165] Remove deprecated variables and methods
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/afa3a454
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/afa3a454
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/afa3a454
Branch: refs/heads/Olingo-129_PocJpaDataStore
Commit: afa3a4541c8096d29751dab9dffd210a46bcac1c
Parents: 5968f1d
Author: Christian Amend <ch...@apache.org>
Authored: Fri Jun 27 16:39:58 2014 +0200
Committer: Christian Amend <ch...@apache.org>
Committed: Fri Jun 27 18:54:53 2014 +0200
----------------------------------------------------------------------
.../processor/core/ListsProcessor.java | 11 +-
.../core/datasource/BeanPropertyAccess.java | 8 +-
.../core/datasource/BeanPropertyAccessTest.java | 2 +-
.../core/ODataJPAResponseBuilderTest.java | 2 +-
.../olingo/odata2/api/edm/EdmMapping.java | 9 --
.../olingo/odata2/api/edm/provider/Mapping.java | 18 ----
.../api/ep/EntityProviderWriteProperties.java | 25 -----
.../olingo/odata2/core/ODataRequestImpl.java | 1 -
.../odata2/core/ep/BasicEntityProvider.java | 6 +-
.../core/ep/consumer/JsonEntryConsumer.java | 1 -
.../ep/producer/AtomEntryEntityProducer.java | 42 +++-----
.../ep/producer/JsonEntryEntityProducer.java | 19 ++--
.../ep/producer/XmlPropertyEntityProducer.java | 4 +-
.../olingo/odata2/core/ODataRequestTest.java | 1 -
.../core/edm/provider/EdmMappingTest.java | 5 +-
.../edm/provider/EdmPropertyImplProvTest.java | 3 +-
.../odata2/core/ep/AbstractProviderTest.java | 1 +
.../ep/ODataEntityProviderPropertiesTest.java | 14 ---
.../core/ep/producer/AtomEntryProducerTest.java | 105 ++++++++++++++-----
.../core/ep/producer/AtomFeedProducerTest.java | 16 ++-
.../producer/JsonEntryEntityProducerTest.java | 95 +++++++++--------
.../odata2/ref/edm/ScenarioEdmProvider.java | 15 ++-
.../ref/processor/BeanPropertyAccess.java | 8 +-
.../odata2/ref/processor/ListsProcessor.java | 11 +-
.../olingo/odata2/testutil/mock/EdmMock.java | 6 +-
.../odata2/testutil/mock/EdmTestProvider.java | 8 +-
26 files changed, 197 insertions(+), 239 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/afa3a454/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/ListsProcessor.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/ListsProcessor.java b/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/ListsProcessor.java
index 2c18668..a03136b 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/ListsProcessor.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/ListsProcessor.java
@@ -567,7 +567,7 @@ public class ListsProcessor extends DataSourceProcessor {
final List<EdmProperty> propertyPath = uriInfo.getPropertyPath();
final EdmProperty property = propertyPath.get(propertyPath.size() - 1);
final Object value = property.isSimple() ?
- property.getMapping() == null || property.getMapping().getMimeType() == null ?
+ property.getMapping() == null || property.getMapping().getMediaResourceMimeTypeKey() == null ?
getPropertyValue(data, propertyPath) : getSimpleTypeValueMap(data, propertyPath) :
getStructuralTypeValueMap(getPropertyValue(data, propertyPath), (EdmStructuralType) property.getType());
@@ -604,7 +604,7 @@ public class ListsProcessor extends DataSourceProcessor {
final List<EdmProperty> propertyPath = uriInfo.getPropertyPath();
final EdmProperty property = propertyPath.get(propertyPath.size() - 1);
- final Object value = property.getMapping() == null || property.getMapping().getMimeType() == null ?
+ final Object value = property.getMapping() == null || property.getMapping().getMediaResourceMimeTypeKey() == null ?
getPropertyValue(data, propertyPath) : getSimpleTypeValueMap(data, propertyPath);
return ODataResponse.fromResponse(EntityProvider.writePropertyValue(property, value)).eTag(
@@ -1506,13 +1506,10 @@ public class ListsProcessor extends DataSourceProcessor {
private void handleMimeType(final Object data, final EdmMapping mapping, final Map<String, Object> valueMap)
throws ODataException {
- final String mimeTypeName = mapping.getMimeType();
+ final String mimeTypeName = mapping.getMediaResourceMimeTypeKey();
if (mimeTypeName != null) {
Object value = valueAccess.getMappingValue(data, mapping);
valueMap.put(mimeTypeName, value);
- if (mapping.getMediaResourceMimeTypeKey() != null) {
- valueMap.put(mapping.getMediaResourceMimeTypeKey(), value);
- }
}
}
@@ -1543,7 +1540,7 @@ public class ListsProcessor extends DataSourceProcessor {
final Object value = valueAccess.getPropertyValue(data, property);
if (property.isSimple()) {
- if (property.getMapping() == null || property.getMapping().getMimeType() == null) {
+ if (property.getMapping() == null || property.getMapping().getMediaResourceMimeTypeKey() == null) {
valueMap.put(propertyName, value);
} else {
// TODO: enable MIME type mapping outside the current subtree
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/afa3a454/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/datasource/BeanPropertyAccess.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/datasource/BeanPropertyAccess.java b/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/datasource/BeanPropertyAccess.java
index 290b99f..cd88b81 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/datasource/BeanPropertyAccess.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/datasource/BeanPropertyAccess.java
@@ -55,16 +55,16 @@ public class BeanPropertyAccess implements ValueAccess {
@Override
public <T> Object getMappingValue(final T data, final EdmMapping mapping) throws ODataException {
- if (mapping != null && mapping.getMimeType() != null) {
- return getValue(data, mapping.getMimeType());
+ if (mapping != null && mapping.getMediaResourceMimeTypeKey() != null) {
+ return getValue(data, mapping.getMediaResourceMimeTypeKey());
}
return null;
}
@Override
public <T, V> void setMappingValue(final T data, final EdmMapping mapping, final V value) throws ODataException {
- if (mapping != null && mapping.getMimeType() != null) {
- setValue(data, getSetterMethodName(mapping.getMimeType()), value);
+ if (mapping != null && mapping.getMediaResourceMimeTypeKey() != null) {
+ setValue(data, getSetterMethodName(mapping.getMediaResourceMimeTypeKey()), value);
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/afa3a454/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/datasource/BeanPropertyAccessTest.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/datasource/BeanPropertyAccessTest.java b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/datasource/BeanPropertyAccessTest.java
index 9d25e0a..76e0cb4 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/datasource/BeanPropertyAccessTest.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/datasource/BeanPropertyAccessTest.java
@@ -234,7 +234,7 @@ public class BeanPropertyAccessTest {
private EdmMapping mockMapping(final String mimeTypeKey) throws EdmException {
EdmMapping mapping = Mockito.mock(EdmMapping.class);
- Mockito.when(mapping.getMimeType()).thenReturn(mimeTypeKey);
+ Mockito.when(mapping.getMediaResourceMimeTypeKey()).thenReturn(mimeTypeKey);
return mapping;
}
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/afa3a454/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPAResponseBuilderTest.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPAResponseBuilderTest.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPAResponseBuilderTest.java
index 1345260..049b365 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPAResponseBuilderTest.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPAResponseBuilderTest.java
@@ -386,7 +386,7 @@ public class ODataJPAResponseBuilderTest extends JPAEdmTestModelView {
EdmProperty edmProperty = EasyMock.createMock(EdmProperty.class);
EdmMapping edmMapping = EasyMock.createMock(EdmMapping.class);
EasyMock.expect(edmMapping.getInternalName()).andStubReturn("soId");
- EasyMock.expect(edmMapping.getMimeType()).andReturn(null);
+ EasyMock.expect(edmMapping.getMediaResourceMimeTypeKey()).andReturn(null);
EasyMock.replay(edmMapping);
try {
EasyMock.expect(edmProperty.getName()).andStubReturn("ID");
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/afa3a454/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmMapping.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmMapping.java b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmMapping.java
index 2c1116d..5bf01d3 100644
--- a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmMapping.java
+++ b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmMapping.java
@@ -33,15 +33,6 @@ public interface EdmMapping {
String getInternalName();
/**
- * Get the mapping name for mime type lookup
- *
- * @return mapping name as String
- * @deprecated use instead functionality of {@link #getMediaResourceMimeTypeKey()} method
- */
- @Deprecated
- String getMimeType();
-
- /**
* Gets the key under which the resource source value can be found in the data map.
* @return the key of the media resource source
*/
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/afa3a454/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Mapping.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Mapping.java b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Mapping.java
index d9e3453..34d03a1 100644
--- a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Mapping.java
+++ b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Mapping.java
@@ -27,7 +27,6 @@ import org.apache.olingo.odata2.api.edm.EdmMapping;
public class Mapping implements EdmMapping {
private String value;
- private String mimeType;
private Object object;
private String mediaResourceSourceKey;
private String mediaResourceMimeTypeKey;
@@ -38,11 +37,6 @@ public class Mapping implements EdmMapping {
}
@Override
- public String getMimeType() {
- return mimeType;
- }
-
- @Override
public Object getObject() {
return object;
}
@@ -68,18 +62,6 @@ public class Mapping implements EdmMapping {
}
/**
- * Sets the mime type for this {@link Mapping}.
- * @param mimeType
- * @return {@link Mapping} for method chaining
- * @deprecated use instead functionality of {@link #setMediaResourceMimeTypeKey(String)} method
- */
- @Deprecated
- public Mapping setMimeType(final String mimeType) {
- this.mimeType = mimeType;
- return this;
- }
-
- /**
* Sets an object. This method can be used by a provider to set whatever it wants to associate with this.
* @param object
* @return {@link Mapping} for method chaining
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/afa3a454/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderWriteProperties.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderWriteProperties.java b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderWriteProperties.java
index b4422ee..4273b30 100644
--- a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderWriteProperties.java
+++ b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderWriteProperties.java
@@ -34,8 +34,6 @@ import org.apache.olingo.odata2.api.uri.ExpandSelectTreeNode;
public class EntityProviderWriteProperties {
private URI serviceRoot;
- @Deprecated
- private String mediaResourceMimeType;
private InlineCount inlineCountType;
private Integer inlineCount;
private String nextLink;
@@ -82,17 +80,6 @@ public class EntityProviderWriteProperties {
}
/**
- * Gets the MIME type of the media resource.
- * @return the MIME type of the media resource
- * @deprecated use instead the functionality of 'EdmMapping -> mediaResourceMimeTypeKey' to reference via a key
- * to the 'mime type' of the media resource provided in the entity data map
- */
- @Deprecated
- public final String getMediaResourceMimeType() {
- return mediaResourceMimeType;
- }
-
- /**
* Gets the type of the inlinecount request from the system query option.
* @return the type of the inlinecount request from the system query option
*/
@@ -156,17 +143,6 @@ public class EntityProviderWriteProperties {
}
/**
- * @param mediaResourceMimeType the mediaResourceMimeType to set
- * @deprecated use instead the functionality of 'EdmMapping -> mediaResourceMimeTypeKey' to reference via a key
- * to the 'mime type' of the media resource provided in the entity data map
- */
- @Deprecated
- public final ODataEntityProviderPropertiesBuilder mediaResourceMimeType(final String mediaResourceMimeType) {
- properties.mediaResourceMimeType = mediaResourceMimeType;
- return this;
- }
-
- /**
* @param inlineCountType the inlineCountType to set
*/
public final ODataEntityProviderPropertiesBuilder inlineCountType(final InlineCount inlineCountType) {
@@ -251,7 +227,6 @@ public class EntityProviderWriteProperties {
public ODataEntityProviderPropertiesBuilder fromProperties(final EntityProviderWriteProperties properties) {
- this.properties.mediaResourceMimeType = properties.getMediaResourceMimeType();
this.properties.inlineCountType = properties.getInlineCountType();
this.properties.inlineCount = properties.getInlineCount();
this.properties.nextLink = properties.getNextLink();
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/afa3a454/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataRequestImpl.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataRequestImpl.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataRequestImpl.java
index 5bfcaf9..5a67ae7 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataRequestImpl.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataRequestImpl.java
@@ -20,7 +20,6 @@ package org.apache.olingo.odata2.core;
import java.io.InputStream;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/afa3a454/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/BasicEntityProvider.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/BasicEntityProvider.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/BasicEntityProvider.java
index a32b916..c8b2520 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/BasicEntityProvider.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/BasicEntityProvider.java
@@ -56,8 +56,6 @@ import org.apache.olingo.odata2.core.ep.util.CircleStreamBuffer;
/**
* Provider for all basic (content type independent) entity provider methods.
- *
- *
*/
public class BasicEntityProvider {
@@ -163,8 +161,8 @@ public class BasicEntityProvider {
if (edmProperty.getMimeType() != null) {
contentType = edmProperty.getMimeType();
} else {
- if (edmProperty.getMapping() != null && edmProperty.getMapping().getMimeType() != null) {
- String mimeTypeMapping = edmProperty.getMapping().getMimeType();
+ if (edmProperty.getMapping() != null && edmProperty.getMapping().getMediaResourceMimeTypeKey() != null) {
+ String mimeTypeMapping = edmProperty.getMapping().getMediaResourceMimeTypeKey();
if (value instanceof Map) {
final Map<?, ?> mappedData = (Map<?, ?>) value;
binary = mappedData.get(edmProperty.getName());
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/afa3a454/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryConsumer.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryConsumer.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryConsumer.java
index 1a6bca2..45726ba 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryConsumer.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryConsumer.java
@@ -264,7 +264,6 @@ public class JsonEntryConsumer {
throw new EntityProviderException(EntityProviderException.MISSING_ATTRIBUTE.addContent(FormatJson.CONTENT_TYPE)
.addContent(FormatJson.METADATA));
}
- // TODO Mime Type Mapping
} else {
if (mediaMetadata.getContentType() != null || mediaMetadata.getEditLink() != null
|| mediaMetadata.getEtag() != null || mediaMetadata.getSourceLink() != null) {
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/afa3a454/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/AtomEntryEntityProducer.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/AtomEntryEntityProducer.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/AtomEntryEntityProducer.java
index bd519e0..89b7e6e 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/AtomEntryEntityProducer.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/AtomEntryEntityProducer.java
@@ -59,7 +59,6 @@ import org.apache.olingo.odata2.core.commons.Encoder;
import org.apache.olingo.odata2.core.edm.EdmDateTimeOffset;
import org.apache.olingo.odata2.core.ep.aggregator.EntityInfoAggregator;
import org.apache.olingo.odata2.core.ep.aggregator.EntityPropertyInfo;
-import org.apache.olingo.odata2.core.ep.util.FormatJson;
import org.apache.olingo.odata2.core.ep.util.FormatXml;
/**
@@ -351,19 +350,17 @@ public class AtomEntryEntityProducer {
private void appendAtomContentLink(final XMLStreamWriter writer, final EntityInfoAggregator eia,
final Map<String, Object> data, final String selfLink) throws EntityProviderException, EdmException {
try {
- String mediaResourceMimeType = properties.getMediaResourceMimeType();
- if (mediaResourceMimeType == null) {
- EdmMapping entityTypeMapping = eia.getEntityType().getMapping();
- if (entityTypeMapping != null) {
- String mediaResourceMimeTypeKey = entityTypeMapping.getMediaResourceMimeTypeKey();
- if (mediaResourceMimeTypeKey != null) {
- mediaResourceMimeType = (String) data.get(mediaResourceMimeTypeKey);
- }
- }
- if (mediaResourceMimeType == null) {
- mediaResourceMimeType = ContentType.APPLICATION_OCTET_STREAM.toString();
+ String mediaResourceMimeType = null;
+ EdmMapping entityTypeMapping = eia.getEntityType().getMapping();
+ if (entityTypeMapping != null) {
+ String mediaResourceMimeTypeKey = entityTypeMapping.getMediaResourceMimeTypeKey();
+ if (mediaResourceMimeTypeKey != null) {
+ mediaResourceMimeType = (String) data.get(mediaResourceMimeTypeKey);
}
}
+ if (mediaResourceMimeType == null) {
+ mediaResourceMimeType = ContentType.APPLICATION_OCTET_STREAM.toString();
+ }
writer.writeStartElement(FormatXml.ATOM_LINK);
writer.writeAttribute(FormatXml.ATOM_HREF, selfLink + "/$value");
@@ -379,10 +376,9 @@ public class AtomEntryEntityProducer {
final Map<String, Object> data, final String selfLink) throws EntityProviderException, EdmException {
try {
- // We have to support the media resource mime type at the properties till version 1.2 then this can be refactored
- String mediaResourceMimeType = properties.getMediaResourceMimeType();
EdmMapping entityTypeMapping = eia.getEntityType().getMapping();
String self = null;
+ String mediaResourceMimeType = null;
if (entityTypeMapping != null) {
String mediaResourceSourceKey = entityTypeMapping.getMediaResourceSourceKey();
@@ -392,22 +388,16 @@ public class AtomEntryEntityProducer {
if (self == null) {
self = selfLink + "/$value";
}
- if (mediaResourceMimeType == null) {
- String mediaResourceMimeTypeKey =
- entityTypeMapping.getMimeType() != null ? entityTypeMapping.getMimeType()
- : entityTypeMapping.getMediaResourceMimeTypeKey();
- if (mediaResourceMimeTypeKey != null) {
- mediaResourceMimeType = (String) data.get(mediaResourceMimeTypeKey);
- }
- if (mediaResourceMimeType == null) {
- mediaResourceMimeType = ContentType.APPLICATION_OCTET_STREAM.toString();
- }
+ String mediaResourceMimeTypeKey = entityTypeMapping.getMediaResourceMimeTypeKey();
+ if (mediaResourceMimeTypeKey != null) {
+ mediaResourceMimeType = (String) data.get(mediaResourceMimeTypeKey);
}
- } else {
- self = selfLink + "/$value";
if (mediaResourceMimeType == null) {
mediaResourceMimeType = ContentType.APPLICATION_OCTET_STREAM.toString();
}
+ } else {
+ self = selfLink + "/$value";
+ mediaResourceMimeType = ContentType.APPLICATION_OCTET_STREAM.toString();
}
writer.writeStartElement(FormatXml.ATOM_CONTENT);
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/afa3a454/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonEntryEntityProducer.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonEntryEntityProducer.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonEntryEntityProducer.java
index 5369f95..ab2daf8 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonEntryEntityProducer.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonEntryEntityProducer.java
@@ -24,7 +24,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import java.util.Set;
import org.apache.olingo.odata2.api.ODataCallback;
import org.apache.olingo.odata2.api.edm.Edm;
@@ -218,9 +217,8 @@ public class JsonEntryEntityProducer {
if (type.hasStream()) {
jsonStreamWriter.separator();
- // We have to support the media resource mime type at the properties till version 1.2 then this can be refactored
- String mediaResourceMimeType = properties.getMediaResourceMimeType();
EdmMapping entityTypeMapping = entityInfo.getEntityType().getMapping();
+ String mediaResourceMimeType = null;
String mediaSrc = null;
if (entityTypeMapping != null) {
@@ -231,19 +229,16 @@ public class JsonEntryEntityProducer {
if (mediaSrc == null) {
mediaSrc = self + "/$value";
}
- if (mediaResourceMimeType == null) {
- mediaResourceMimeType =
- entityTypeMapping.getMimeType() != null ? (String) data.get(entityTypeMapping.getMimeType())
- : (String) data.get(entityTypeMapping.getMediaResourceMimeTypeKey());
- if (mediaResourceMimeType == null) {
- mediaResourceMimeType = ContentType.APPLICATION_OCTET_STREAM.toString();
- }
+ String mediaResourceMimeTypeKey = entityTypeMapping.getMediaResourceMimeTypeKey();
+ if (mediaResourceMimeTypeKey != null) {
+ mediaResourceMimeType = (String) data.get(mediaResourceMimeTypeKey);
}
- } else {
- mediaSrc = self + "/$value";
if (mediaResourceMimeType == null) {
mediaResourceMimeType = ContentType.APPLICATION_OCTET_STREAM.toString();
}
+ } else {
+ mediaSrc = self + "/$value";
+ mediaResourceMimeType = ContentType.APPLICATION_OCTET_STREAM.toString();
}
jsonStreamWriter.namedStringValueRaw(FormatJson.CONTENT_TYPE, mediaResourceMimeType);
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/afa3a454/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlPropertyEntityProducer.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlPropertyEntityProducer.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlPropertyEntityProducer.java
index b36205a..bf89349 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlPropertyEntityProducer.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlPropertyEntityProducer.java
@@ -183,8 +183,8 @@ public class XmlPropertyEntityProducer {
String mimeType = null;
if (prop.getMimeType() != null) {
mimeType = prop.getMimeType();
- } else if (prop.getMapping() != null && prop.getMapping().getMimeType() != null) {
- mimeType = (String) extractChildValue(value, prop.getMapping().getMimeType());
+ } else if (prop.getMapping() != null && prop.getMapping().getMediaResourceMimeTypeKey() != null) {
+ mimeType = (String) extractChildValue(value, prop.getMapping().getMediaResourceMimeTypeKey());
contentValue = extractChildValue(value, prop.getName());
}
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/afa3a454/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataRequestTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataRequestTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataRequestTest.java
index 541077f..0652a73 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataRequestTest.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataRequestTest.java
@@ -25,7 +25,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.olingo.odata2.api.edm.provider.Property;
import org.apache.olingo.odata2.api.processor.ODataRequest;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/afa3a454/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmMappingTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmMappingTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmMappingTest.java
index 62da2e7..7f8757d 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmMappingTest.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmMappingTest.java
@@ -47,8 +47,7 @@ public class EdmMappingTest extends BaseTest {
mappedObject = new EdmMappingTest();
- Mapping propertySimpleMapping =
- new Mapping().setMimeType("mimeType").setInternalName("value").setObject(mappedObject);
+ Mapping propertySimpleMapping = new Mapping().setInternalName("value").setObject(mappedObject);
CustomizableFeedMappings propertySimpleFeedMappings = new CustomizableFeedMappings().setFcKeepInContent(true);
SimpleProperty propertySimple =
new SimpleProperty().setName("PropertyName").setType(EdmSimpleTypeKind.String)
@@ -67,7 +66,6 @@ public class EdmMappingTest extends BaseTest {
EdmMapping mapping = propertySimpleProvider.getMapping();
assertNotNull(mapping);
assertEquals("value", mapping.getInternalName());
- assertEquals("mimeType", mapping.getMimeType());
assertEquals(mappedObject, mapping.getObject());
}
@@ -76,7 +74,6 @@ public class EdmMappingTest extends BaseTest {
EdmMapping mapping = navPropertyProvider.getMapping();
assertNotNull(mapping);
assertEquals("value", mapping.getInternalName());
- assertEquals("mimeType", mapping.getMimeType());
assertEquals(mappedObject, mapping.getObject());
}
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/afa3a454/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmPropertyImplProvTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmPropertyImplProvTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmPropertyImplProvTest.java
index 79ef3a6..c9348df 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmPropertyImplProvTest.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmPropertyImplProvTest.java
@@ -59,7 +59,7 @@ public class EdmPropertyImplProvTest extends BaseTest {
edmProvider = mock(EdmProvider.class);
EdmImplProv edmImplProv = new EdmImplProv(edmProvider);
- Mapping propertySimpleMapping = new Mapping().setMimeType("mimeType2").setInternalName("value");
+ Mapping propertySimpleMapping = new Mapping().setInternalName("value");
CustomizableFeedMappings propertySimpleFeedMappings = new CustomizableFeedMappings().setFcKeepInContent(true);
SimpleProperty propertySimple =
new SimpleProperty().setName("PropertyName").setType(EdmSimpleTypeKind.String)
@@ -94,7 +94,6 @@ public class EdmPropertyImplProvTest extends BaseTest {
assertEquals(EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.String), propertySimpleProvider.getType());
assertEquals("mimeType", propertySimpleProvider.getMimeType());
assertNotNull(propertySimpleProvider.getMapping());
- assertEquals("mimeType2", propertySimpleProvider.getMapping().getMimeType());
assertNotNull(propertySimpleProvider.getCustomizableFeedMappings());
assertEquals("value", propertySimpleProvider.getMapping().getInternalName());
assertNull(propertySimpleProvider.getFacets());
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/afa3a454/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/AbstractProviderTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/AbstractProviderTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/AbstractProviderTest.java
index 3845675..d9462c2 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/AbstractProviderTest.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/AbstractProviderTest.java
@@ -95,6 +95,7 @@ public abstract class AbstractProviderTest extends AbstractXmlProducerTestHelper
employeeData.put("EntryDate", date);
employeeData.put("TeamId", "42");
employeeData.put("EmployeeName", "Walter Winter");
+ //employeeData.put("getImageType", "abc");
Map<String, Object> locationData = new HashMap<String, Object>();
Map<String, Object> cityData = new HashMap<String, Object>();
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/afa3a454/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/ODataEntityProviderPropertiesTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/ODataEntityProviderPropertiesTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/ODataEntityProviderPropertiesTest.java
index 73c957a..94f6650 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/ODataEntityProviderPropertiesTest.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/ODataEntityProviderPropertiesTest.java
@@ -69,7 +69,6 @@ public class ODataEntityProviderPropertiesTest extends BaseTest {
.expandSelectTree(expandSelectTree)
.inlineCount(1)
.inlineCountType(InlineCount.ALLPAGES)
- .mediaResourceMimeType("image/png")
.nextLink("http://localhost")
.selfLink(selfLink)
.includeSimplePropertyType(true)
@@ -82,7 +81,6 @@ public class ODataEntityProviderPropertiesTest extends BaseTest {
assertTrue("No callback found.", properties.getCallbacks().containsKey("aCallback"));
assertEquals("Wrong expand select tree.", expandSelectTree, properties.getExpandSelectTree());
assertEquals("Wrong self link.", selfLink, properties.getSelfLink());
- assertEquals("Wrong media resource mime type.", "image/png", properties.getMediaResourceMimeType());
assertEquals("Wrong base uri.", "http://localhost:80/", properties.getServiceRoot().toASCIIString());
assertEquals("Wrong inline count type.", InlineCount.ALLPAGES, properties.getInlineCountType());
assertEquals("Wrong inline count.", Integer.valueOf(1), properties.getInlineCount());
@@ -94,16 +92,6 @@ public class ODataEntityProviderPropertiesTest extends BaseTest {
}
@Test
- public void buildEntryProperties() throws Exception {
- final String mediaResourceMimeType = "text/html";
- final URI serviceRoot = new URI("http://localhost:80/");
- final EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(serviceRoot)
- .mediaResourceMimeType(mediaResourceMimeType)
- .build();
- assertEquals("Wrong mime type.", "text/html", properties.getMediaResourceMimeType());
- }
-
- @Test
public void buildEntryPropertiesFromExisting() throws Exception {
URI serviceRoot = new URI("http://localhost:80/");
Map<String, ODataCallback> callbacks = new HashMap<String, ODataCallback>();
@@ -117,7 +105,6 @@ public class ODataEntityProviderPropertiesTest extends BaseTest {
.expandSelectTree(expandSelectTree)
.inlineCount(1)
.inlineCountType(InlineCount.ALLPAGES)
- .mediaResourceMimeType("image/png")
.nextLink("http://localhost")
.selfLink(selfLink)
.includeSimplePropertyType(true)
@@ -135,7 +122,6 @@ public class ODataEntityProviderPropertiesTest extends BaseTest {
assertTrue(fromProperties.getCallbacks().containsKey("aCallback"));
assertEquals(expandSelectTree, fromProperties.getExpandSelectTree());
assertEquals(selfLink, fromProperties.getSelfLink());
- assertEquals("image/png", fromProperties.getMediaResourceMimeType());
assertEquals("Wrong base uri.", "http://localhost:80/", fromProperties.getServiceRoot().toASCIIString());
assertEquals("Wrong inline count type.", InlineCount.ALLPAGES, fromProperties.getInlineCountType());
assertEquals("Wrong inline count.", Integer.valueOf(1), fromProperties.getInlineCount());
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/afa3a454/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/AtomEntryProducerTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/AtomEntryProducerTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/AtomEntryProducerTest.java
index db59c1e..b7a350a 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/AtomEntryProducerTest.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/AtomEntryProducerTest.java
@@ -31,9 +31,11 @@ import static org.mockito.Mockito.when;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
+import java.util.Calendar;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.TimeZone;
import javax.xml.stream.FactoryConfigurationError;
import javax.xml.stream.XMLStreamException;
@@ -567,10 +569,34 @@ public class AtomEntryProducerTest extends AbstractProviderTest {
public void serializeAtomMediaResourceWithMimeType() throws IOException, XpathException, SAXException,
XMLStreamException, FactoryConfigurationError, ODataException {
AtomEntityProvider ser = createAtomEntityProvider();
- EntityProviderWriteProperties properties =
- EntityProviderWriteProperties.serviceRoot(BASE_URI).mediaResourceMimeType("abc").build();
+ EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).build();
+ Map<String, Object> localEmployeeData = new HashMap<String, Object>();
+
+ Calendar date = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
+ date.clear();
+ date.set(1999, 0, 1);
+
+ localEmployeeData.put("EmployeeId", "1");
+ localEmployeeData.put("ImmageUrl", null);
+ localEmployeeData.put("ManagerId", "1");
+ localEmployeeData.put("Age", new Integer(52));
+ localEmployeeData.put("RoomId", "1");
+ localEmployeeData.put("EntryDate", date);
+ localEmployeeData.put("TeamId", "42");
+ localEmployeeData.put("EmployeeName", "Walter Winter");
+ localEmployeeData.put("getImageType", "abc");
+
+ Map<String, Object> locationData = new HashMap<String, Object>();
+ Map<String, Object> cityData = new HashMap<String, Object>();
+ cityData.put("PostalCode", "33470");
+ cityData.put("CityName", "Duckburg");
+ locationData.put("City", cityData);
+ locationData.put("Country", "Calisota");
+
+ localEmployeeData.put("Location", locationData);
ODataResponse response =
- ser.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), employeeData,
+ ser.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"),
+ localEmployeeData,
properties);
String xmlString = verifyResponse(response);
@@ -614,10 +640,34 @@ public class AtomEntryProducerTest extends AbstractProviderTest {
public void serializeEmployeeAndCheckOrderOfTags() throws IOException, XpathException, SAXException,
XMLStreamException, FactoryConfigurationError, ODataException {
AtomEntityProvider ser = createAtomEntityProvider();
- EntityProviderWriteProperties properties =
- EntityProviderWriteProperties.serviceRoot(BASE_URI).mediaResourceMimeType("abc").build();
+ EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI).build();
+ Map<String, Object> localEmployeeData = new HashMap<String, Object>();
+
+ Calendar date = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
+ date.clear();
+ date.set(1999, 0, 1);
+
+ localEmployeeData.put("EmployeeId", "1");
+ localEmployeeData.put("ImmageUrl", null);
+ localEmployeeData.put("ManagerId", "1");
+ localEmployeeData.put("Age", new Integer(52));
+ localEmployeeData.put("RoomId", "1");
+ localEmployeeData.put("EntryDate", date);
+ localEmployeeData.put("TeamId", "42");
+ localEmployeeData.put("EmployeeName", "Walter Winter");
+ localEmployeeData.put("getImageType", "abc");
+
+ Map<String, Object> locationData = new HashMap<String, Object>();
+ Map<String, Object> cityData = new HashMap<String, Object>();
+ cityData.put("PostalCode", "33470");
+ cityData.put("CityName", "Duckburg");
+ locationData.put("City", cityData);
+ locationData.put("Country", "Calisota");
+
+ localEmployeeData.put("Location", locationData);
ODataResponse response =
- ser.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), employeeData,
+ ser.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"),
+ localEmployeeData,
properties);
String xmlString = verifyResponse(response);
@@ -649,7 +699,7 @@ public class AtomEntryProducerTest extends AbstractProviderTest {
XMLStreamException, FactoryConfigurationError, ODataException {
AtomEntityProvider ser = createAtomEntityProvider();
EntityProviderWriteProperties properties =
- EntityProviderWriteProperties.serviceRoot(BASE_URI).mediaResourceMimeType("abc").build();
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).build();
EdmEntitySet employeeEntitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees");
ODataResponse response = ser.writeEntry(employeeEntitySet, employeeData, properties);
String xmlString = verifyResponse(response);
@@ -672,7 +722,7 @@ public class AtomEntryProducerTest extends AbstractProviderTest {
XMLStreamException, FactoryConfigurationError, ODataException {
AtomEntityProvider ser = createAtomEntityProvider();
EntityProviderWriteProperties properties =
- EntityProviderWriteProperties.serviceRoot(BASE_URI).mediaResourceMimeType("abc").build();
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).build();
EdmEntitySet employeeEntitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees");
// set "keepInContent" to false for EntryDate
@@ -1026,7 +1076,6 @@ public class AtomEntryProducerTest extends AbstractProviderTest {
EdmMapping mapping = employeesSet.getEntityType().getMapping();
when(mapping.getMediaResourceSourceKey()).thenReturn(mediaResourceSourceKey);
when(mapping.getMediaResourceMimeTypeKey()).thenReturn(mediaResourceMimeTypeKey);
- when(mapping.getMimeType()).thenReturn(null);
ODataResponse response = ser.writeEntry(employeesSet, localEmployeeData, DEFAULT_PROPERTIES);
String xmlString = verifyResponse(response);
@@ -1084,25 +1133,25 @@ public class AtomEntryProducerTest extends AbstractProviderTest {
assertXpathNotExists("/a:entry/a:content[@src=\"http://localhost:8080/images/image1\"]", xmlString);
}
- @Test
- public void assureGetMimeTypeWinsOverGetMediaResourceMimeTypeKey() throws Exception {
- // Keep this test till version 1.2
- AtomEntityProvider ser = createAtomEntityProvider();
- Map<String, Object> localEmployeeData = new HashMap<String, Object>(employeeData);
- String mediaResourceMimeTypeKey = "~type";
- localEmployeeData.put(mediaResourceMimeTypeKey, "wrong");
- String originalMimeTypeKey = "~originalType";
- localEmployeeData.put(originalMimeTypeKey, "right");
- EdmEntitySet employeesSet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees");
- EdmMapping mapping = employeesSet.getEntityType().getMapping();
- when(mapping.getMediaResourceMimeTypeKey()).thenReturn(mediaResourceMimeTypeKey);
- when(mapping.getMimeType()).thenReturn(originalMimeTypeKey);
- ODataResponse response = ser.writeEntry(employeesSet, localEmployeeData, DEFAULT_PROPERTIES);
- String xmlString = verifyResponse(response);
-
- assertXpathExists("/a:entry/a:content[@type=\"right\"]", xmlString);
- assertXpathNotExists("/a:entry/a:content[@type=\"wrong\"]", xmlString);
- }
+// @Test
+// public void assureGetMimeTypeWinsOverGetMediaResourceMimeTypeKey() throws Exception {
+// // Keep this test till version 1.2
+// AtomEntityProvider ser = createAtomEntityProvider();
+// Map<String, Object> localEmployeeData = new HashMap<String, Object>(employeeData);
+// String mediaResourceMimeTypeKey = "~type";
+// localEmployeeData.put(mediaResourceMimeTypeKey, "wrong");
+// String originalMimeTypeKey = "~originalType";
+// localEmployeeData.put(originalMimeTypeKey, "right");
+// EdmEntitySet employeesSet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees");
+// EdmMapping mapping = employeesSet.getEntityType().getMapping();
+// when(mapping.getMediaResourceMimeTypeKey()).thenReturn(mediaResourceMimeTypeKey);
+// when(mapping.getMimeType()).thenReturn(originalMimeTypeKey);
+// ODataResponse response = ser.writeEntry(employeesSet, localEmployeeData, DEFAULT_PROPERTIES);
+// String xmlString = verifyResponse(response);
+//
+// assertXpathExists("/a:entry/a:content[@type=\"right\"]", xmlString);
+// assertXpathNotExists("/a:entry/a:content[@type=\"wrong\"]", xmlString);
+// }
private void verifyTagOrdering(final String xmlString, final String... toCheckTags) {
XMLUnitHelper.verifyTagOrdering(xmlString, toCheckTags);
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/afa3a454/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/AtomFeedProducerTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/AtomFeedProducerTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/AtomFeedProducerTest.java
index 6608558..37432dd 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/AtomFeedProducerTest.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/AtomFeedProducerTest.java
@@ -84,7 +84,7 @@ public class AtomFeedProducerTest extends AbstractProviderTest {
public void testFeedNamespaces() throws Exception {
AtomEntityProvider ser = createAtomEntityProvider();
EntityProviderWriteProperties properties =
- EntityProviderWriteProperties.serviceRoot(BASE_URI).mediaResourceMimeType("mediatype").build();
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).build();
ODataResponse response = ser.writeFeed(view.getTargetEntitySet(), roomsData, properties);
String xmlString = verifyResponse(response);
@@ -96,7 +96,7 @@ public class AtomFeedProducerTest extends AbstractProviderTest {
public void testSelfLink() throws Exception {
AtomEntityProvider ser = createAtomEntityProvider();
EntityProviderWriteProperties properties =
- EntityProviderWriteProperties.serviceRoot(BASE_URI).mediaResourceMimeType("mediatype").build();
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).build();
ODataResponse response = ser.writeFeed(view.getTargetEntitySet(), roomsData, properties);
String xmlString = verifyResponse(response);
@@ -110,7 +110,7 @@ public class AtomFeedProducerTest extends AbstractProviderTest {
String customLink = "Test";
AtomEntityProvider ser = createAtomEntityProvider();
EntityProviderWriteProperties properties =
- EntityProviderWriteProperties.serviceRoot(BASE_URI).mediaResourceMimeType("mediatype").selfLink(
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).selfLink(
new URI(customLink)).build();
ODataResponse response = ser.writeFeed(view.getTargetEntitySet(), roomsData, properties);
String xmlString = verifyResponse(response);
@@ -124,7 +124,7 @@ public class AtomFeedProducerTest extends AbstractProviderTest {
public void testFeedMandatoryParts() throws Exception {
AtomEntityProvider ser = createAtomEntityProvider();
EntityProviderWriteProperties properties =
- EntityProviderWriteProperties.serviceRoot(BASE_URI).mediaResourceMimeType("mediatype").build();
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).build();
ODataResponse response = ser.writeFeed(view.getTargetEntitySet(), roomsData, properties);
String xmlString = verifyResponse(response);
@@ -153,7 +153,6 @@ public class AtomFeedProducerTest extends AbstractProviderTest {
AtomEntityProvider ser = createAtomEntityProvider();
EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI)
- .mediaResourceMimeType("mediatype")
.inlineCount(Integer.valueOf(103))
.inlineCountType(InlineCount.ALLPAGES)
.build();
@@ -170,7 +169,7 @@ public class AtomFeedProducerTest extends AbstractProviderTest {
AtomEntityProvider ser = createAtomEntityProvider();
EntityProviderWriteProperties properties =
- EntityProviderWriteProperties.serviceRoot(BASE_URI).mediaResourceMimeType("mediatype").build();
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).build();
ODataResponse response = ser.writeFeed(view.getTargetEntitySet(), roomsData, properties);
String xmlString = verifyResponse(response);
@@ -183,7 +182,6 @@ public class AtomFeedProducerTest extends AbstractProviderTest {
AtomEntityProvider ser = createAtomEntityProvider();
EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI)
- .mediaResourceMimeType("mediatype")
.nextLink("http://thisisanextlink")
.build();
ODataResponse response = ser.writeFeed(view.getTargetEntitySet(), roomsData, properties);
@@ -197,7 +195,7 @@ public class AtomFeedProducerTest extends AbstractProviderTest {
public void testInlineCountInvalid() throws Exception {
AtomEntityProvider ser = createAtomEntityProvider();
EntityProviderWriteProperties properties =
- EntityProviderWriteProperties.serviceRoot(BASE_URI).mediaResourceMimeType("mediatype").inlineCountType(
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).inlineCountType(
InlineCount.ALLPAGES).build();
ser.writeFeed(view.getTargetEntitySet(), roomsData, properties);
}
@@ -208,7 +206,7 @@ public class AtomFeedProducerTest extends AbstractProviderTest {
AtomEntityProvider ser = createAtomEntityProvider();
EntityProviderWriteProperties properties =
- EntityProviderWriteProperties.serviceRoot(BASE_URI).mediaResourceMimeType("mediatype").build();
+ EntityProviderWriteProperties.serviceRoot(BASE_URI).build();
ODataResponse response = ser.writeFeed(view.getTargetEntitySet(), roomsData, properties);
String xmlString = verifyResponse(response);
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/afa3a454/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonEntryEntityProducerTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonEntryEntityProducerTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonEntryEntityProducerTest.java
index 7040e2a..f07b56c 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonEntryEntityProducerTest.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonEntryEntityProducerTest.java
@@ -768,7 +768,6 @@ public class JsonEntryEntityProducerTest extends BaseTest {
EdmMapping mapping = employeesSet.getEntityType().getMapping();
when(mapping.getMediaResourceSourceKey()).thenReturn(mediaResourceSourceKey);
when(mapping.getMediaResourceMimeTypeKey()).thenReturn(mediaResourceMimeTypeKey);
- when(mapping.getMimeType()).thenReturn(null);
ODataResponse response = new JsonEntityProvider().writeEntry(employeesSet, employeeData, DEFAULT_PROPERTIES);
String jsonString = verifyResponse(response);
@@ -846,53 +845,53 @@ public class JsonEntryEntityProducerTest extends BaseTest {
assertNull(jsonMap.get("edit_media"));
}
- @SuppressWarnings("unchecked")
- @Test
- public void assureGetMimeTypeWinsOverGetMediaResourceMimeTypeKey() throws Exception {
- // Keep this test till version 1.2
- Map<String, Object> employeeData = new HashMap<String, Object>();
-
- Calendar date = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
- date.clear();
- date.set(1999, 0, 1);
-
- employeeData.put("EmployeeId", "1");
- employeeData.put("ImmageUrl", null);
- employeeData.put("ManagerId", "1");
- employeeData.put("Age", new Integer(52));
- employeeData.put("RoomId", "1");
- employeeData.put("EntryDate", date);
- employeeData.put("TeamId", "42");
- employeeData.put("EmployeeName", "Walter Winter");
-
- Map<String, Object> locationData = new HashMap<String, Object>();
- Map<String, Object> cityData = new HashMap<String, Object>();
- cityData.put("PostalCode", "33470");
- cityData.put("CityName", "Duckburg");
- locationData.put("City", cityData);
- locationData.put("Country", "Calisota");
-
- employeeData.put("Location", locationData);
- String mediaResourceMimeTypeKey = "~type";
- employeeData.put(mediaResourceMimeTypeKey, "wrong");
- String originalMimeTypeKey = "~originalType";
- employeeData.put(originalMimeTypeKey, "right");
-
- EdmEntitySet employeesSet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees");
- EdmMapping mapping = employeesSet.getEntityType().getMapping();
- when(mapping.getMediaResourceMimeTypeKey()).thenReturn(mediaResourceMimeTypeKey);
- when(mapping.getMimeType()).thenReturn(originalMimeTypeKey);
-
- ODataResponse response = new JsonEntityProvider().writeEntry(employeesSet, employeeData, DEFAULT_PROPERTIES);
- String jsonString = verifyResponse(response);
-
- Gson gson = new Gson();
- StringMap<Object> jsonMap = gson.fromJson(jsonString, StringMap.class);
- jsonMap = (StringMap<Object>) jsonMap.get("d");
- jsonMap = (StringMap<Object>) jsonMap.get("__metadata");
-
- assertEquals("right", jsonMap.get("content_type"));
- }
+// @SuppressWarnings("unchecked")
+// @Test
+// public void assureGetMimeTypeWinsOverGetMediaResourceMimeTypeKey() throws Exception {
+// // Keep this test till version 1.2
+// Map<String, Object> employeeData = new HashMap<String, Object>();
+//
+// Calendar date = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
+// date.clear();
+// date.set(1999, 0, 1);
+//
+// employeeData.put("EmployeeId", "1");
+// employeeData.put("ImmageUrl", null);
+// employeeData.put("ManagerId", "1");
+// employeeData.put("Age", new Integer(52));
+// employeeData.put("RoomId", "1");
+// employeeData.put("EntryDate", date);
+// employeeData.put("TeamId", "42");
+// employeeData.put("EmployeeName", "Walter Winter");
+//
+// Map<String, Object> locationData = new HashMap<String, Object>();
+// Map<String, Object> cityData = new HashMap<String, Object>();
+// cityData.put("PostalCode", "33470");
+// cityData.put("CityName", "Duckburg");
+// locationData.put("City", cityData);
+// locationData.put("Country", "Calisota");
+//
+// employeeData.put("Location", locationData);
+// String mediaResourceMimeTypeKey = "~type";
+// employeeData.put(mediaResourceMimeTypeKey, "wrong");
+// String originalMimeTypeKey = "~originalType";
+// employeeData.put(originalMimeTypeKey, "right");
+//
+// EdmEntitySet employeesSet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees");
+// EdmMapping mapping = employeesSet.getEntityType().getMapping();
+// when(mapping.getMediaResourceMimeTypeKey()).thenReturn(mediaResourceMimeTypeKey);
+// when(mapping.getMimeType()).thenReturn(originalMimeTypeKey);
+//
+// ODataResponse response = new JsonEntityProvider().writeEntry(employeesSet, employeeData, DEFAULT_PROPERTIES);
+// String jsonString = verifyResponse(response);
+//
+// Gson gson = new Gson();
+// StringMap<Object> jsonMap = gson.fromJson(jsonString, StringMap.class);
+// jsonMap = (StringMap<Object>) jsonMap.get("d");
+// jsonMap = (StringMap<Object>) jsonMap.get("__metadata");
+//
+// assertEquals("right", jsonMap.get("content_type"));
+// }
@Test
public void additionalLink() throws Exception {
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/afa3a454/odata2-lib/odata-ref/src/main/java/org/apache/olingo/odata2/ref/edm/ScenarioEdmProvider.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-ref/src/main/java/org/apache/olingo/odata2/ref/edm/ScenarioEdmProvider.java b/odata2-lib/odata-ref/src/main/java/org/apache/olingo/odata2/ref/edm/ScenarioEdmProvider.java
index c57b06c..94f7fea 100644
--- a/odata2-lib/odata-ref/src/main/java/org/apache/olingo/odata2/ref/edm/ScenarioEdmProvider.java
+++ b/odata2-lib/odata-ref/src/main/java/org/apache/olingo/odata2/ref/edm/ScenarioEdmProvider.java
@@ -215,7 +215,10 @@ public class ScenarioEdmProvider extends EdmProvider {
.setHasStream(true)
.setKey(getKey("EmployeeId"))
.setNavigationProperties(navigationProperties)
- .setMapping(new Mapping().setMimeType("getImageType").setMediaResourceMimeTypeKey("~mrmtk"));
+ .setMapping(new Mapping()
+// .setMimeType("getImageType")
+// .setMediaResourceMimeTypeKey("~mrmtk")
+ .setMediaResourceMimeTypeKey("getImageType"));
} else if (ENTITY_TYPE_1_BASE.getName().equals(edmFQName.getName())) {
List<Property> properties = new ArrayList<Property>();
@@ -265,7 +268,9 @@ public class ScenarioEdmProvider extends EdmProvider {
.setBaseType(ENTITY_TYPE_1_1)
.setHasStream(true)
.setNavigationProperties(navigationProperties)
- .setMapping(new Mapping().setMimeType("getImageType"));
+ .setMapping(new Mapping()
+// .setMimeType("getImageType")
+ .setMediaResourceMimeTypeKey("getImageType"));
} else if (ENTITY_TYPE_1_5.getName().equals(edmFQName.getName())) {
List<Property> properties = new ArrayList<Property>();
@@ -299,7 +304,7 @@ public class ScenarioEdmProvider extends EdmProvider {
.setFcTargetPath(EdmTargetPath.SYNDICATION_AUTHORURI))
.setMapping(new Mapping().setInternalName("getImageUri")));
properties.add(new SimpleProperty().setName("Image").setType(EdmSimpleTypeKind.Binary)
- .setMapping(new Mapping().setMimeType("getImageType")));
+ .setMapping(new Mapping().setMediaResourceMimeTypeKey("getImageType")));
properties.add(new SimpleProperty().setName("BinaryData").setType(EdmSimpleTypeKind.Binary)
.setFacets(new Facets().setNullable(true))
.setMimeType("image/jpeg"));
@@ -315,7 +320,9 @@ public class ScenarioEdmProvider extends EdmProvider {
.setProperties(properties)
.setHasStream(true)
.setKey(getKey("Id", "Type"))
- .setMapping(new Mapping().setMimeType("getType").setMediaResourceMimeTypeKey("~MediaResourceMimeTypeKey"));
+ .setMapping(new Mapping()
+ //.setMimeType("getType")
+ .setMediaResourceMimeTypeKey("getType"));
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/afa3a454/odata2-lib/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/BeanPropertyAccess.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/BeanPropertyAccess.java b/odata2-lib/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/BeanPropertyAccess.java
index 8898439..8ab3233 100644
--- a/odata2-lib/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/BeanPropertyAccess.java
+++ b/odata2-lib/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/BeanPropertyAccess.java
@@ -51,15 +51,15 @@ public class BeanPropertyAccess {
}
public <T> Object getMappingValue(final T data, final EdmMapping mapping) throws ODataException {
- if (mapping != null && mapping.getMimeType() != null) {
- return getValue(data, mapping.getMimeType());
+ if (mapping != null && mapping.getMediaResourceMimeTypeKey() != null) {
+ return getValue(data, mapping.getMediaResourceMimeTypeKey());
}
return null;
}
public <T, V> void setMappingValue(final T data, final EdmMapping mapping, final V value) throws ODataException {
- if (mapping != null && mapping.getMimeType() != null) {
- setValue(data, getSetterMethodName(mapping.getMimeType()), value);
+ if (mapping != null && mapping.getMediaResourceMimeTypeKey() != null) {
+ setValue(data, getSetterMethodName(mapping.getMediaResourceMimeTypeKey()), value);
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/afa3a454/odata2-lib/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ListsProcessor.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ListsProcessor.java b/odata2-lib/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ListsProcessor.java
index 7e22a3d..86ae0cb 100644
--- a/odata2-lib/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ListsProcessor.java
+++ b/odata2-lib/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ListsProcessor.java
@@ -574,7 +574,7 @@ public class ListsProcessor extends ODataSingleProcessor {
final List<EdmProperty> propertyPath = uriInfo.getPropertyPath();
final EdmProperty property = propertyPath.get(propertyPath.size() - 1);
final Object value = property.isSimple() ?
- property.getMapping() == null || property.getMapping().getMimeType() == null ?
+ property.getMapping() == null || property.getMapping().getMediaResourceMimeTypeKey() == null ?
getPropertyValue(data, propertyPath) : getSimpleTypeValueMap(data, propertyPath) :
getStructuralTypeValueMap(getPropertyValue(data, propertyPath), (EdmStructuralType) property.getType());
@@ -611,7 +611,7 @@ public class ListsProcessor extends ODataSingleProcessor {
final List<EdmProperty> propertyPath = uriInfo.getPropertyPath();
final EdmProperty property = propertyPath.get(propertyPath.size() - 1);
- final Object value = property.getMapping() == null || property.getMapping().getMimeType() == null ?
+ final Object value = property.getMapping() == null || property.getMapping().getMediaResourceMimeTypeKey() == null ?
getPropertyValue(data, propertyPath) : getSimpleTypeValueMap(data, propertyPath);
return ODataResponse.fromResponse(EntityProvider.writePropertyValue(property, value)).eTag(
@@ -1513,13 +1513,10 @@ public class ListsProcessor extends ODataSingleProcessor {
private void handleMimeType(final Object data, final EdmMapping mapping, final Map<String, Object> valueMap)
throws ODataException {
- final String mimeTypeName = mapping.getMimeType();
+ final String mimeTypeName = mapping.getMediaResourceMimeTypeKey();
if (mimeTypeName != null) {
Object value = valueAccess.getMappingValue(data, mapping);
valueMap.put(mimeTypeName, value);
- if (mapping.getMediaResourceMimeTypeKey() != null) {
- valueMap.put(mapping.getMediaResourceMimeTypeKey(), value);
- }
}
}
@@ -1551,7 +1548,7 @@ public class ListsProcessor extends ODataSingleProcessor {
final Object value = valueAccess.getPropertyValue(data, property);
if (property.isSimple()) {
- if (property.getMapping() == null || property.getMapping().getMimeType() == null) {
+ if (property.getMapping() == null || property.getMapping().getMediaResourceMimeTypeKey() == null) {
valueMap.put(propertyName, value);
} else {
// TODO: enable MIME type mapping outside the current subtree
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/afa3a454/odata2-lib/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/EdmMock.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/EdmMock.java b/odata2-lib/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/EdmMock.java
index 66a5708..acf55a4 100644
--- a/odata2-lib/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/EdmMock.java
+++ b/odata2-lib/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/EdmMock.java
@@ -72,7 +72,7 @@ class EdmMock {
EdmEntityType employeeType = employeeEntitySet.getEntityType();
when(employeeType.hasStream()).thenReturn(true);
EdmMapping employeeTypeMapping = Mockito.mock(EdmMapping.class);
- when(employeeTypeMapping.getMimeType()).thenReturn("getImageType");
+ when(employeeTypeMapping.getMediaResourceMimeTypeKey()).thenReturn("getImageType");
when(employeeType.getMapping()).thenReturn(employeeTypeMapping);
when(employeeType.getPropertyNames()).thenReturn(Arrays.asList(
"EmployeeId", "EmployeeName", "ManagerId", "RoomId", "TeamId",
@@ -207,7 +207,7 @@ class EdmMock {
when(photoEntityType.getKeyPropertyNames()).thenReturn(Arrays.asList("Id", "Type"));
when(photoEntityType.hasStream()).thenReturn(true);
EdmMapping photoEntityTypeMapping = Mockito.mock(EdmMapping.class);
- when(photoEntityTypeMapping.getMimeType()).thenReturn("getType");
+ when(photoEntityTypeMapping.getMediaResourceMimeTypeKey()).thenReturn("getType");
when(photoEntityType.getMapping()).thenReturn(photoEntityTypeMapping);
EdmProperty photoIdProperty = createProperty("Id", EdmSimpleTypeKind.Int32, photoEntityType);
EdmFacets photoIdFacet = mock(EdmFacets.class);
@@ -220,7 +220,7 @@ class EdmMock {
EdmProperty photoImageProperty = createProperty("Image", EdmSimpleTypeKind.Binary, photoEntityType);
EdmMapping imageMapping = mock(EdmMapping.class);
- when(imageMapping.getMimeType()).thenReturn("getImageType");
+ when(imageMapping.getMediaResourceMimeTypeKey()).thenReturn("getImageType");
when(photoImageProperty.getMapping()).thenReturn(imageMapping);
EdmProperty binaryDataProperty = createProperty("BinaryData", EdmSimpleTypeKind.Binary, photoEntityType);
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/afa3a454/odata2-lib/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/EdmTestProvider.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/EdmTestProvider.java b/odata2-lib/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/EdmTestProvider.java
index 6aafaaa..3119aca 100644
--- a/odata2-lib/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/EdmTestProvider.java
+++ b/odata2-lib/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/EdmTestProvider.java
@@ -259,7 +259,7 @@ public class EdmTestProvider extends EdmProvider {
.setHasStream(true)
.setKey(getKey("EmployeeId"))
.setNavigationProperties(navigationProperties)
- .setMapping(new Mapping().setMimeType("getImageType"));
+ .setMapping(new Mapping().setMediaResourceMimeTypeKey("getImageType"));
} else if (ENTITY_TYPE_1_BASE.getName().equals(edmFQName.getName())) {
final List<Property> properties = new ArrayList<Property>();
@@ -309,7 +309,7 @@ public class EdmTestProvider extends EdmProvider {
.setBaseType(ENTITY_TYPE_1_1)
.setHasStream(true)
.setNavigationProperties(navigationProperties)
- .setMapping(new Mapping().setMimeType("getImageType"));
+ .setMapping(new Mapping().setMediaResourceMimeTypeKey("getImageType"));
} else if (ENTITY_TYPE_1_5.getName().equals(edmFQName.getName())) {
final List<Property> properties = new ArrayList<Property>();
@@ -343,7 +343,7 @@ public class EdmTestProvider extends EdmProvider {
new CustomizableFeedMappings().setFcTargetPath(EdmTargetPath.SYNDICATION_AUTHORURI))
.setMapping(new Mapping().setInternalName("getImageUri")));
properties.add(new SimpleProperty().setName("Image").setType(EdmSimpleTypeKind.Binary)
- .setMapping(new Mapping().setMimeType("getType")));
+ .setMapping(new Mapping().setMediaResourceMimeTypeKey("getType")));
properties.add(new SimpleProperty().setName("BinaryData").setType(EdmSimpleTypeKind.Binary)
.setFacets(new Facets().setNullable(true))
.setMimeType("image/jpeg"));
@@ -359,7 +359,7 @@ public class EdmTestProvider extends EdmProvider {
.setProperties(properties)
.setHasStream(true)
.setKey(getKey("Id", "Type"))
- .setMapping(new Mapping().setMimeType("getType"));
+ .setMapping(new Mapping().setMediaResourceMimeTypeKey("getType"));
}
}