You are viewing a plain text version of this content. The canonical link for it is here . commits@olingo.apache.org by sk...@apache.org on 2014/01/23 17:32:03 UTC[01/14] git commit: [OLINGO-51] - Full support for Inserting an
Entity and creating a link using the Updated Branches:
refs/heads/olingo-117 38d06b2b6 -> 674f0fa74
[OLINGO-51] - Full support for Inserting an Entity and creating a link
using the <link> tags part of OData entry.
[OLINGO-49] - Handle Links
[OLINGO-45] - Ignore inline entries in case of HTTP PUT. However only
update the links.
Signed-off-by: Chandan V A <ch...@sap.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/commit/1fc260e6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/1fc260e6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/1fc260e6
Branch: refs/heads/olingo-117
Commit: 1fc260e61aee0dba8d95d1e9a50957bf01218138
Parents: 8ed6306
Author: Chandan V A <ch...@sap.com>
Authored: Sat Jan 18 00:29:13 2014 +0530
Committer: Chandan V A <ch...@sap.com>
Committed: Sat Jan 18 00:29:13 2014 +0530
----------------------------------------------------------------------
.../processor/core/access/data/JPAEntity.java | 163 +++++++++------
.../core/access/data/JPAEntityParser.java | 5 +-
.../jpa/processor/core/access/data/JPALink.java | 64 +++---
.../core/access/data/JPAProcessorImpl.java | 3 -
.../core/access/data/JPAEntityTest.java | 3 +-
.../processor/core/mock/data/EdmMockUtilV2.java | 3 +-
.../core/mock/data/ODataEntryMockUtil.java | 34 ++-
.../processor/ref/model/SalesOrderHeader.java | 16 +-
.../jpa/processor/ref/model/SalesOrderItem.java | 208 +++++++++----------
9 files changed, 271 insertions(+), 228 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1fc260e6/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntity.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntity.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntity.java
index f6cf6c1..d7d4446 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntity.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntity.java
@@ -21,7 +21,6 @@ package org.apache.olingo.odata2.jpa.processor.core.access.data;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -36,15 +35,18 @@ import org.apache.olingo.odata2.api.edm.EdmProperty;
import org.apache.olingo.odata2.api.edm.EdmStructuralType;
import org.apache.olingo.odata2.api.edm.EdmTypeKind;
import org.apache.olingo.odata2.api.edm.EdmTyped;
+import org.apache.olingo.odata2.api.ep.entry.EntryMetadata;
import org.apache.olingo.odata2.api.ep.entry.ODataEntry;
import org.apache.olingo.odata2.api.ep.feed.ODataFeed;
import org.apache.olingo.odata2.jpa.processor.api.ODataJPAContext;
+import org.apache.olingo.odata2.jpa.processor.api.exception.ODataJPAModelException;
import org.apache.olingo.odata2.jpa.processor.api.exception.ODataJPARuntimeException;
import org.apache.olingo.odata2.jpa.processor.api.model.JPAEdmMapping;
public class JPAEntity {
private Object jpaEntity = null;
+ private JPAEntity parentJPAEntity = null;
private EdmEntityType oDataEntityType = null;
private EdmEntitySet oDataEntitySet = null;
private Class<?> jpaType = null;
@@ -52,8 +54,9 @@ public class JPAEntity {
private JPAEntityParser jpaEntityParser = null;
private ODataJPAContext oDataJPAContext;
public HashMap<EdmNavigationProperty, EdmEntitySet> inlinedEntities = null;
+ public HashMap<String, List<Object>> relatedJPAEntityMap = null;
- public JPAEntity(final EdmEntityType oDataEntityType, final EdmEntitySet oDataEntitySet,
+ public JPAEntity(final EdmEntityType oDataEntityType, final EdmEntitySet oDataEntitySet,
final ODataJPAContext context) {
this.oDataEntityType = oDataEntityType;
this.oDataEntitySet = oDataEntitySet;
@@ -71,12 +74,21 @@ public class JPAEntity {
this.accessModifiersWrite = accessModifiersWrite;
}
+ public void setParentJPAEntity(JPAEntity jpaEntity) {
+ this.parentJPAEntity = jpaEntity;
+ }
+
+ public JPAEntity getParentJPAEntity() {
+ return this.parentJPAEntity;
+ }
+
public Object getJPAEntity() {
return jpaEntity;
}
@SuppressWarnings("unchecked")
- private void write(final Map<String, Object> oDataEntryProperties, final boolean isCreate)
+ private void write(final Map<String, Object> oDataEntryProperties,
+ final boolean isCreate)
throws ODataJPARuntimeException {
try {
@@ -104,20 +116,13 @@ public class JPAEntity {
jpaEntityParser.getJPAEmbeddableKeyMap(jpaEntity.getClass().getName());
Set<String> propertyNames = null;
if (embeddableKeys != null) {
- List<String> processedKeys =
- setEmbeddableKeyProperty(embeddableKeys, oDataEntityType.getKeyProperties(), oDataEntryProperties,
- jpaEntity);
+ setEmbeddableKeyProperty(embeddableKeys, oDataEntityType.getKeyProperties(), oDataEntryProperties,
+ jpaEntity);
propertyNames = new HashSet<String>();
propertyNames.addAll(oDataEntryProperties.keySet());
- if (processedKeys.isEmpty()) {
- for (String key : embeddableKeys.keySet()) {
- propertyNames.remove(key);
- }
- } else {
- for (String propertyName : processedKeys) {
- propertyNames.remove(propertyName);
- }
+ for (String key : embeddableKeys.keySet()) {
+ propertyNames.remove(key);
}
} else {
propertyNames = oDataEntryProperties.keySet();
@@ -147,37 +152,29 @@ public class JPAEntity {
break;
case NAVIGATION:
case ENTITY:
- structuralType = (EdmStructuralType) edmTyped.getType();
- EdmNavigationProperty navProperty = (EdmNavigationProperty) edmTyped;
- accessModifier =
- jpaEntityParser.getAccessModifier(jpaEntity, navProperty,
- JPAEntityParser.ACCESS_MODIFIER_SET);
- EdmEntitySet edmRelatedEntitySet = oDataEntitySet.getRelatedEntitySet(navProperty);
- List<ODataEntry> relatedEntries = (List<ODataEntry>) oDataEntryProperties.get(propertyName);
- Collection<Object> relatedJPAEntites = instantiateRelatedJPAEntities(jpaEntity, navProperty);
- JPAEntity relatedEntity = new JPAEntity((EdmEntityType) structuralType, edmRelatedEntitySet, oDataJPAContext);
- for (ODataEntry oDataEntry : relatedEntries) {
- relatedEntity.create(oDataEntry);
- relatedJPAEntites.add(relatedEntity.getJPAEntity());
- JPALink link = new JPALink(oDataJPAContext);
- link.create(edmRelatedEntitySet, oDataEntry);
- }
-
- switch (navProperty.getMultiplicity()) {
- case MANY:
- accessModifier.invoke(jpaEntity, relatedJPAEntites);
- break;
- case ONE:
- case ZERO_TO_ONE:
- accessModifier.invoke(jpaEntity, relatedJPAEntites.iterator().next());
- break;
- }
+ if (isCreate) {
+ structuralType = (EdmStructuralType) edmTyped.getType();
+ EdmNavigationProperty navProperty = (EdmNavigationProperty) edmTyped;
+ EdmEntitySet edmRelatedEntitySet = oDataEntitySet.getRelatedEntitySet(navProperty);
+ List<ODataEntry> relatedEntries = (List<ODataEntry>) oDataEntryProperties.get(propertyName);
+ if (inlinedEntities == null) {
+ inlinedEntities = new HashMap<EdmNavigationProperty, EdmEntitySet>();
+ }
- if (inlinedEntities == null) {
- inlinedEntities = new HashMap<EdmNavigationProperty, EdmEntitySet>();
+ if (relatedJPAEntityMap == null) {
+ relatedJPAEntityMap = new HashMap<String, List<Object>>();
+ }
+ List<Object> relatedJPAEntities = new ArrayList<Object>();
+ JPAEntity relatedEntity =
+ new JPAEntity((EdmEntityType) structuralType, edmRelatedEntitySet, oDataJPAContext);
+ for (ODataEntry oDataEntry : relatedEntries) {
+ relatedEntity.setParentJPAEntity(this);
+ relatedEntity.create(oDataEntry);
+ relatedJPAEntities.add(relatedEntity.getJPAEntity());
+ }
+ relatedJPAEntityMap.put(navProperty.getName(), relatedJPAEntities);
+ inlinedEntities.put((EdmNavigationProperty) edmTyped, edmRelatedEntitySet);
}
-
- inlinedEntities.put((EdmNavigationProperty) edmTyped, edmRelatedEntitySet);
default:
continue;
}
@@ -189,21 +186,6 @@ public class JPAEntity {
}
}
- @SuppressWarnings("unchecked")
- private Collection<Object> instantiateRelatedJPAEntities(final Object jpaEntity,
- final EdmNavigationProperty navProperty)
- throws InstantiationException,
- IllegalAccessException, EdmException, ODataJPARuntimeException, IllegalArgumentException,
- InvocationTargetException {
- Method accessModifier =
- jpaEntityParser.getAccessModifier(jpaEntity, navProperty, JPAEntityParser.ACCESS_MODIFIER_GET);
- Collection<Object> relatedJPAEntities = (Collection<Object>) accessModifier.invoke(jpaEntity);
- if (relatedJPAEntities == null) {
- relatedJPAEntities = new ArrayList<Object>();
- }
- return relatedJPAEntities;
- }
-
public void create(final ODataEntry oDataEntry) throws ODataJPARuntimeException {
if (oDataEntry == null) {
throw ODataJPARuntimeException
@@ -214,6 +196,50 @@ public class JPAEntity {
normalizeInlineEntries(oDataEntryProperties);
}
write(oDataEntryProperties, true);
+
+ EntryMetadata entryMetadata = oDataEntry.getMetadata();
+ List<String> leftNavPrpNames = new ArrayList<String>();
+ try {
+ for (String navigationPropertyName : oDataEntityType.getNavigationPropertyNames()) {
+ List<String> links = entryMetadata.getAssociationUris(navigationPropertyName);
+ if (links.isEmpty()) {
+ continue;
+ } else {
+ EdmNavigationProperty navProperty =
+ (EdmNavigationProperty) oDataEntityType.getProperty(navigationPropertyName);
+ if (relatedJPAEntityMap != null && relatedJPAEntityMap.containsKey(navigationPropertyName)) {
+ JPALink.linkJPAEntities(relatedJPAEntityMap.get(navigationPropertyName), this.jpaEntity,
+ navProperty);
+ } else if (parentJPAEntity != null
+ &&
+ parentJPAEntity.getEdmEntitySet().getName().equals(
+ oDataEntitySet.getRelatedEntitySet(navProperty).getName())) {
+ List<Object> targetJPAEntities = new ArrayList<Object>();
+ targetJPAEntities.add(parentJPAEntity.getJPAEntity());
+ JPALink.linkJPAEntities(targetJPAEntities, this.jpaEntity, navProperty);
+ } else {
+ leftNavPrpNames.add(navigationPropertyName);
+ }
+ }
+ }
+ if (!leftNavPrpNames.isEmpty()) {
+ JPALink link = new JPALink(oDataJPAContext);
+ link.setSourceJPAEntity(this.jpaEntity);
+ link.create(oDataEntitySet, oDataEntry, leftNavPrpNames);
+ }
+ } catch (EdmException e) {
+ throw ODataJPARuntimeException
+ .throwException(ODataJPARuntimeException.GENERAL
+ .addContent(e.getMessage()), e);
+ } catch (ODataJPAModelException e) {
+ throw ODataJPARuntimeException
+ .throwException(ODataJPARuntimeException.GENERAL
+ .addContent(e.getMessage()), e);
+ }
+ }
+
+ public EdmEntitySet getEdmEntitySet() {
+ return oDataEntitySet;
}
public void create(final Map<String, Object> oDataEntryProperties) throws ODataJPARuntimeException {
@@ -231,6 +257,19 @@ public class JPAEntity {
normalizeInlineEntries(oDataEntryProperties);
}
write(oDataEntryProperties, false);
+ JPALink link = new JPALink(oDataJPAContext);
+ link.setSourceJPAEntity(this.jpaEntity);
+ try {
+ link.create(oDataEntitySet, oDataEntry, oDataEntityType.getNavigationPropertyNames());
+ } catch (EdmException e) {
+ throw ODataJPARuntimeException
+ .throwException(ODataJPARuntimeException.GENERAL
+ .addContent(e.getMessage()), e);
+ } catch (ODataJPAModelException e) {
+ throw ODataJPARuntimeException
+ .throwException(ODataJPARuntimeException.GENERAL
+ .addContent(e.getMessage()), e);
+ }
}
public void update(final Map<String, Object> oDataEntryProperties) throws ODataJPARuntimeException {
@@ -294,7 +333,7 @@ public class JPAEntity {
}
}
- protected List<String> setEmbeddableKeyProperty(final HashMap<String, String> embeddableKeys,
+ protected void setEmbeddableKeyProperty(final HashMap<String, String> embeddableKeys,
final List<EdmProperty> oDataEntryKeyProperties,
final Map<String, Object> oDataEntryProperties, final Object entity)
throws ODataJPARuntimeException, EdmException, IllegalAccessException, IllegalArgumentException,
@@ -303,7 +342,6 @@ public class JPAEntity {
HashMap<String, Object> embeddableObjMap = new HashMap<String, Object>();
List<EdmProperty> leftODataEntryKeyProperties = new ArrayList<EdmProperty>();
HashMap<String, String> leftEmbeddableKeys = new HashMap<String, String>();
- List<String> processedKeys = new ArrayList<String>();
for (EdmProperty edmProperty : oDataEntryKeyProperties) {
if (oDataEntryProperties.containsKey(edmProperty.getName()) == false) {
@@ -339,13 +377,8 @@ public class JPAEntity {
leftODataEntryKeyProperties.add(edmProperty);
leftEmbeddableKeys
.put(edmPropertyName, embeddableKeyNameComposite.split(embeddableKeyNameSplit[0] + ".", 2)[1]);
- processedKeys.addAll(setEmbeddableKeyProperty(leftEmbeddableKeys, leftODataEntryKeyProperties,
- oDataEntryProperties, embeddableObj));
}
- processedKeys.add(edmPropertyName);
-
}
- return processedKeys;
}
protected Object instantiateJPAEntity() throws InstantiationException, IllegalAccessException {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1fc260e6/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParser.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParser.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParser.java
index 45e517d..dd030ce 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParser.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParser.java
@@ -192,6 +192,9 @@ public final class JPAEntityParser {
Object propertyValue = jpaEntity;
Method method = null;
for (String namePart : nameParts) {
+ if (propertyValue == null) {
+ break;
+ }
method = propertyValue.getClass().getMethod(
namePart, (Class<?>[]) null);
method.setAccessible(true);
@@ -314,7 +317,7 @@ public final class JPAEntityParser {
} catch (SecurityException e1) {
throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e1);
}
- if (acceserMethod != null){
+ if (acceserMethod != null) {
accessModifierMap.put(
propertyName,
acceserMethod);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1fc260e6/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPALink.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPALink.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPALink.java
index 18b5664..91ac44e 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPALink.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPALink.java
@@ -192,20 +192,25 @@ public class JPALink {
}
- public void create(final EdmEntitySet entitySet, final ODataEntry oDataEntry) throws ODataJPARuntimeException,
+ public void create(final EdmEntitySet entitySet, final ODataEntry oDataEntry,
+ List<String> navigationPropertyNames)
+ throws ODataJPARuntimeException,
ODataJPAModelException {
- List<String> navPropertyNames;
+
try {
- navPropertyNames = entitySet.getEntityType().getNavigationPropertyNames();
- for (String navPropertyName : navPropertyNames) {
+ for (String navPropertyName : navigationPropertyNames) {
List<String> links = oDataEntry.getMetadata().getAssociationUris(navPropertyName);
if (links != null && links.isEmpty() == false) {
+ EdmNavigationProperty navProperty = (EdmNavigationProperty) entitySet.getEntityType()
+ .getProperty(
+ navPropertyName);
+
for (String link : links) {
UriInfo bindingUriInfo = parser.parseBindingLink(link, new HashMap<String, String>());
targetJPAEntity = jpaProcessor.process((GetEntityUriInfo) bindingUriInfo);
- linkJPAEntities(targetJPAEntity, sourceJPAEntity, (EdmNavigationProperty) entitySet.getEntityType()
- .getProperty(
- navPropertyName));
+ List<Object> targetJPAEntities = new ArrayList<Object>();
+ targetJPAEntities.add(targetJPAEntity);
+ linkJPAEntities(targetJPAEntities, sourceJPAEntity, navProperty);
}
}
}
@@ -215,7 +220,7 @@ public class JPALink {
}
- public void create(final PostUriInfo uriInfo, final ODataEntry oDataEntry) throws ODataJPARuntimeException,
+ public void create(final PostUriInfo uriInfo) throws ODataJPARuntimeException,
ODataJPAModelException {
try {
int index = context.getODataContext().getPathInfo().getODataSegments().size() - 2;
@@ -228,12 +233,12 @@ public class JPALink {
throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.RESOURCE_X_NOT_FOUND
.addContent(parsedUriInfo.getTargetEntitySet().getName()), null);
}
- linkJPAEntities(sourceJPAEntity, targetJPAEntity, uriInfo.getNavigationSegments().get(0)
+ List<Object> targetJPAEntities = new ArrayList<Object>();
+ targetJPAEntities.add(sourceJPAEntity);
+ linkJPAEntities(targetJPAEntities, targetJPAEntity, uriInfo.getNavigationSegments().get(0)
.getNavigationProperty());
}
- create(uriInfo.getTargetEntitySet(), oDataEntry);
-
} catch (EdmException e) {
throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
} catch (ODataException e) {
@@ -273,7 +278,9 @@ public class JPALink {
}
}
if (targetJPAEntity != null && sourceJPAEntity != null) {
- linkJPAEntities(targetJPAEntity, sourceJPAEntity, navigationProperty);
+ List<Object> targetJPAEntities = new ArrayList<Object>();
+ targetJPAEntities.add(targetJPAEntity);
+ linkJPAEntities(targetJPAEntities, sourceJPAEntity, navigationProperty);
}
} catch (IllegalArgumentException e) {
@@ -285,27 +292,34 @@ public class JPALink {
}
}
- private void
- linkJPAEntities(final Object targetJPAEntity, final Object sourceJPAEntity,
- final EdmNavigationProperty navigationProperty)
- throws ODataJPARuntimeException {
+ @SuppressWarnings("unchecked")
+ public static void linkJPAEntities(final Collection<Object> targetJPAEntities, final Object sourceJPAEntity,
+ final EdmNavigationProperty navigationProperty) throws ODataJPARuntimeException {
+ if (targetJPAEntities == null || sourceJPAEntity == null || navigationProperty == null) {
+ return;
+ }
try {
JPAEntityParser entityParser = new JPAEntityParser();
Method setMethod = entityParser.getAccessModifier(sourceJPAEntity,
navigationProperty, JPAEntityParser.ACCESS_MODIFIER_SET);
- Method getMethod = entityParser.getAccessModifier(sourceJPAEntity,
- navigationProperty, JPAEntityParser.ACCESS_MODIFIER_GET);
-
- if (getMethod.getReturnType().getTypeParameters() != null
- && getMethod.getReturnType().getTypeParameters().length != 0) {
- @SuppressWarnings("unchecked")
+ switch (navigationProperty.getMultiplicity()) {
+ case MANY:
+ Method getMethod = entityParser.getAccessModifier(sourceJPAEntity,
+ navigationProperty, JPAEntityParser.ACCESS_MODIFIER_GET);
Collection<Object> relatedEntities = (Collection<Object>) getMethod.invoke(sourceJPAEntity);
- relatedEntities.add(targetJPAEntity);
+ relatedEntities.addAll(targetJPAEntities);
setMethod.invoke(sourceJPAEntity, relatedEntities);
- } else {
- setMethod.invoke(sourceJPAEntity, targetJPAEntity);
+ break;
+ case ONE:
+ case ZERO_TO_ONE:
+ setMethod.invoke(sourceJPAEntity, targetJPAEntities.iterator().next());
+ break;
}
+ } catch (EdmException e) {
+ throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e);
+ } catch (IllegalArgumentException e) {
+ throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e);
} catch (IllegalAccessException e) {
throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e);
} catch (InvocationTargetException e) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1fc260e6/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAProcessorImpl.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAProcessorImpl.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAProcessorImpl.java
index 1a8a0f0..0b46fd9 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAProcessorImpl.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAProcessorImpl.java
@@ -314,9 +314,6 @@ public class JPAProcessorImpl implements JPAProcessor {
final ODataEntry oDataEntry =
oDataEntityParser.parseEntry(oDataEntitySet, content, requestedContentType, false);
virtualJPAEntity.create(oDataEntry);
- JPALink link = new JPALink(oDataJPAContext);
- link.setSourceJPAEntity(virtualJPAEntity.getJPAEntity());
- link.create(createView, oDataEntry);
} else if (properties != null) {
virtualJPAEntity.create(properties);
} else {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1fc260e6/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityTest.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityTest.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityTest.java
index caf3167..71e2204 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityTest.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityTest.java
@@ -112,7 +112,6 @@ public class JPAEntityTest {
assertTrue(jpaTypeMock.getMDateTime().equals(ODataEntryMockUtil.VALUE_DATE_TIME));
JPARelatedTypeMock relatedType = jpaTypeMock.getMRelatedEntity();
- assertNotNull(jpaTypeMock.getMRelatedEntity());
assertEquals(relatedType.getMByte(), ODataEntryMockUtil.VALUE_MBYTE);
assertEquals(relatedType.getMByteArray(), ODataEntryMockUtil.VALUE_MBYTEARRAY);
assertEquals(relatedType.getMDouble(), ODataEntryMockUtil.VALUE_MDOUBLE, 0.0);
@@ -146,7 +145,7 @@ public class JPAEntityTest {
EdmEntitySet edmEntitySet = EdmMockUtilV2.mockEdmEntitySet(JPATypeMock.ENTITY_NAME, false);
EdmEntityType edmEntityType = edmEntitySet.getEntityType();
- jpaEntity = new JPAEntity(edmEntityType, edmEntitySet, null);
+ jpaEntity = new JPAEntity(edmEntityType, edmEntitySet, ODataJPAContextMock.mockODataJPAContext());
JPATypeMock jpaTypeMock = new JPATypeMock();
jpaEntity.setJPAEntity(jpaTypeMock);
jpaEntity.update(ODataEntryMockUtil.mockODataEntry(JPATypeMock.ENTITY_NAME));
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1fc260e6/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/data/EdmMockUtilV2.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/data/EdmMockUtilV2.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/data/EdmMockUtilV2.java
index 2ecf5dd..a15fbc1 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/data/EdmMockUtilV2.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/data/EdmMockUtilV2.java
@@ -75,7 +75,8 @@ public class EdmMockUtilV2 {
EasyMock.expect(entityType.getPropertyNames()).andReturn(mockPropertyNamesWithComplexType(entityName)).anyTimes();
}
- EasyMock.expect(entityType.getNavigationPropertyNames()).andReturn(mockNavigationPropertyNames(entityName));
+ EasyMock.expect(entityType.getNavigationPropertyNames()).andReturn(mockNavigationPropertyNames(entityName))
+ .anyTimes();
EasyMock.expect(entityType.getKind()).andReturn(EdmTypeKind.ENTITY);
EasyMock.expect(entityType.getMapping()).andReturn((EdmMapping) mockEdmMapping(entityName, null, null));
EasyMock.expect(entityType.getKeyProperties()).andReturn(mockKeyProperties(entityName)).anyTimes();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1fc260e6/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/data/ODataEntryMockUtil.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/data/ODataEntryMockUtil.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/data/ODataEntryMockUtil.java
index 019bfb6..125f160 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/data/ODataEntryMockUtil.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/data/ODataEntryMockUtil.java
@@ -51,11 +51,7 @@ public class ODataEntryMockUtil {
ODataEntry oDataEntry = EasyMock.createMock(ODataEntry.class);
EasyMock.expect(oDataEntry.getProperties()).andReturn(mockODataEntryProperties(entityName)).anyTimes();
- EasyMock.expect(oDataEntry.containsInlineEntry()).andReturn(false).anyTimes();
- EntryMetadata entryMetadata = EasyMock.createMock(EntryMetadata.class);
- EasyMock.expect(entryMetadata.getAssociationUris(EasyMock.isA(String.class))).andReturn(null).anyTimes();
- EasyMock.replay(entryMetadata);
- EasyMock.expect(oDataEntry.getMetadata()).andReturn(entryMetadata).anyTimes();
+ enhanceMockODataEntry(oDataEntry, false, new ArrayList<String>());
EasyMock.replay(oDataEntry);
return oDataEntry;
}
@@ -65,7 +61,7 @@ public class ODataEntryMockUtil {
EasyMock.expect(oDataEntry.getProperties()).andReturn(mockODataEntryPropertiesWithComplexType(entityName))
.anyTimes();
- EasyMock.expect(oDataEntry.containsInlineEntry()).andReturn(false).anyTimes();
+ enhanceMockODataEntry(oDataEntry, false, new ArrayList<String>());
EasyMock.replay(oDataEntry);
return oDataEntry;
}
@@ -122,11 +118,33 @@ public class ODataEntryMockUtil {
ODataEntry oDataEntry = EasyMock.createMock(ODataEntry.class);
EasyMock.expect(oDataEntry.getProperties()).andReturn(mockODataEntryPropertiesWithInline(entityName)).anyTimes();
if (entityName.equals(JPATypeMock.ENTITY_NAME)) {
- EasyMock.expect(oDataEntry.containsInlineEntry()).andReturn(true).anyTimes();
+ List<String> links = new ArrayList<String>();
+ links.add(JPATypeMock.ENTITY_NAME + "(" + ODataEntryMockUtil.VALUE_MINT + ")/"
+ + JPATypeMock.NAVIGATION_PROPERTY_X);
+ enhanceMockODataEntry(oDataEntry, true, links);
} else {
- EasyMock.expect(oDataEntry.containsInlineEntry()).andReturn(false).anyTimes();
+ enhanceMockODataEntry(oDataEntry, false, new ArrayList<String>());
}
EasyMock.replay(oDataEntry);
return oDataEntry;
}
+
+ private static void
+ enhanceMockODataEntry(final ODataEntry oDataEntry, boolean hasInline, List<String> associationURIs) {
+ EasyMock.expect(oDataEntry.containsInlineEntry()).andReturn(hasInline).anyTimes();
+ EntryMetadata entryMetadata = EasyMock.createMock(EntryMetadata.class);
+ if (hasInline) {
+ EasyMock.expect(entryMetadata.getAssociationUris(JPATypeMock.NAVIGATION_PROPERTY_X)).andReturn(associationURIs)
+ .anyTimes();
+ EasyMock.expect(entryMetadata.getAssociationUris(JPATypeMock.NAVIGATION_PROPERTY_XS)).andReturn(
+ new ArrayList<String>())
+ .anyTimes();
+ } else {
+ EasyMock.expect(entryMetadata.getAssociationUris(EasyMock.isA(String.class))).andReturn(associationURIs)
+ .anyTimes();
+ }
+
+ EasyMock.replay(entryMetadata);
+ EasyMock.expect(oDataEntry.getMetadata()).andReturn(entryMetadata).anyTimes();
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1fc260e6/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SalesOrderHeader.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SalesOrderHeader.java b/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SalesOrderHeader.java
index c6a28c5..74a39c8 100644
--- a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SalesOrderHeader.java
+++ b/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SalesOrderHeader.java
@@ -26,6 +26,7 @@ import java.util.List;
import java.util.Set;
import java.util.TimeZone;
+import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
@@ -81,27 +82,16 @@ public class SalesOrderHeader {
@Column(precision = 8)
private double netAmount;
- @Column(name = "CUST_ID")
- private Long customerId;
-
- @OneToMany(mappedBy = "salesOrderHeader")
+ @OneToMany(mappedBy = "salesOrderHeader", cascade = CascadeType.ALL)
private Set<SalesOrderItem> salesOrderItem = new HashSet<SalesOrderItem>();
@OneToMany(mappedBy = "salesOrderHeader")
private List<Note> notes = new ArrayList<Note>();
@ManyToOne
- @JoinColumn(name = "CUST_ID", referencedColumnName = "ID", insertable = false, updatable = false)
+ @JoinColumn(name = "CUST_ID", referencedColumnName = "ID")
private Customer customer;
- public Long getCustomerId() {
- return customerId;
- }
-
- public void setCustomerId(final Long customerId) {
- this.customerId = customerId;
- }
-
public Customer getCustomer() {
return customer;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1fc260e6/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SalesOrderItem.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SalesOrderItem.java b/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SalesOrderItem.java
index 9ee0f19..a8671d1 100644
--- a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SalesOrderItem.java
+++ b/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SalesOrderItem.java
@@ -30,116 +30,104 @@ import javax.persistence.Transient;
@Table(name = "T_SALESORDERITEM")
public class SalesOrderItem {
- public SalesOrderItem() {
- }
+ public SalesOrderItem() {}
- public SalesOrderItem(final int quantity, final double amount,
- final double discount, final Material material) {
- super();
- this.quantity = quantity;
- this.amount = amount;
- this.discount = discount;
- this.material = material;
- }
-
- @EmbeddedId
- private SalesOrderItemKey salesOrderItemKey;
-
- @Column(name = "Material_Id", nullable = false)
- private long matId;
-
- @Column
- private int quantity;
-
- @Column
- private double amount;
-
- @Column
- private double discount;
-
- @Transient
- private double netAmount;
-
- @Column
- private boolean delivered;
-
- public Boolean isDelivered() {
- return delivered;
- }
-
- public void setDelivered(final Boolean deliveryStatus) {
- this.delivered = deliveryStatus;
- }
-
- @JoinColumn(name = "Material_Id", referencedColumnName = "MATERIAL_ID", insertable = false, updatable = false)
- @ManyToOne
- private Material material;
-
- @JoinColumn(name = "Sales_Order_Id", referencedColumnName = "SO_ID", insertable = false, updatable = false)
- @ManyToOne
- private SalesOrderHeader salesOrderHeader;
-
- public SalesOrderItemKey getSalesOrderItemKey() {
- return salesOrderItemKey;
- }
-
- public void setSalesOrderItemKey(final SalesOrderItemKey salesOrderItemKey) {
- this.salesOrderItemKey = salesOrderItemKey;
- }
-
- public long getMatId() {
- return matId;
- }
-
- public void setMatId(final long matId) {
- this.matId = matId;
- }
-
- public int getQuantity() {
- return quantity;
- }
-
- public void setQuantity(final int quantity) {
- this.quantity = quantity;
- }
-
- public double getAmount() {
- return amount;
- }
-
- public void setAmount(final double amount) {
- this.amount = amount;
- }
-
- public double getDiscount() {
- return discount;
- }
-
- public void setDiscount(final double discount) {
- this.discount = discount;
- }
-
- public double getNetAmount() {
- return netAmount;
- }
-
- public void setNetAmount(final double netAmount) {
- this.netAmount = netAmount;
- }
-
- public Material getMaterial() {
- return material;
- }
-
- public void setMaterial(final Material material) {
- this.material = material;
- }
-
- public SalesOrderHeader getSalesOrderHeader() {
- return salesOrderHeader;
- }
+ public SalesOrderItem(final int quantity, final double amount,
+ final double discount, final Material material) {
+ super();
+ this.quantity = quantity;
+ this.amount = amount;
+ this.discount = discount;
+ this.material = material;
+ }
- public void setSalesOrderHeader(final SalesOrderHeader salesOrderHeader) {
- this.salesOrderHeader = salesOrderHeader;
- }
+ @EmbeddedId
+ private SalesOrderItemKey salesOrderItemKey;
+
+ @Column
+ private int quantity;
+
+ @Column
+ private double amount;
+
+ @Column
+ private double discount;
+
+ @Transient
+ private double netAmount;
+
+ @Column
+ private boolean delivered;
+
+ public Boolean isDelivered() {
+ return delivered;
+ }
+
+ public void setDelivered(final Boolean deliveryStatus) {
+ this.delivered = deliveryStatus;
+ }
+
+ @JoinColumn(name = "Material_Id", referencedColumnName = "MATERIAL_ID")
+ @ManyToOne
+ private Material material;
+
+ @JoinColumn(name = "Sales_Order_Id", referencedColumnName = "SO_ID", insertable = false, updatable = false)
+ @ManyToOne
+ private SalesOrderHeader salesOrderHeader;
+
+ public SalesOrderItemKey getSalesOrderItemKey() {
+ return salesOrderItemKey;
+ }
+
+ public void setSalesOrderItemKey(final SalesOrderItemKey salesOrderItemKey) {
+ this.salesOrderItemKey = salesOrderItemKey;
+ }
+
+ public int getQuantity() {
+ return quantity;
+ }
+
+ public void setQuantity(final int quantity) {
+ this.quantity = quantity;
+ }
+
+ public double getAmount() {
+ return amount;
+ }
+
+ public void setAmount(final double amount) {
+ this.amount = amount;
+ }
+
+ public double getDiscount() {
+ return discount;
+ }
+
+ public void setDiscount(final double discount) {
+ this.discount = discount;
+ }
+
+ public double getNetAmount() {
+ return netAmount;
+ }
+
+ public void setNetAmount(final double netAmount) {
+ this.netAmount = netAmount;
+ }
+
+ public Material getMaterial() {
+ return material;
+ }
+
+ public void setMaterial(final Material material) {
+ this.material = material;
+ }
+
+ public SalesOrderHeader getSalesOrderHeader() {
+ return salesOrderHeader;
+ }
+
+ public void setSalesOrderHeader(final SalesOrderHeader salesOrderHeader) {
+ this.salesOrderHeader = salesOrderHeader;
+ }
}
[06/14] git commit: [OLINGO-131] distribution for annotation
processor added
Posted by sk...@apache.org. [OLINGO-131] distribution for annotation processor added
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/commit/8ede3bf7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/8ede3bf7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/8ede3bf7
Branch: refs/heads/olingo-117
Commit: 8ede3bf740a8c7307ff8395023c2a3d9e00bc70f
Parents: d86ec45
Author: Stephan Klevenz <sk...@apache.org>
Authored: Tue Jan 21 13:56:29 2014 +0100
Committer: Stephan Klevenz <sk...@apache.org>
Committed: Tue Jan 21 13:56:29 2014 +0100
----------------------------------------------------------------------
odata2-dist/janos/pom.xml | 103 ++++
.../janos/src/main/assembly/janos-assembly.xml | 48 ++
odata2-dist/janos/src/main/resources/LICENSE | 587 +++++++++++++++++++
odata2-dist/janos/src/main/resources/NOTICE | 5 +
odata2-dist/pom.xml | 1 +
odata2-dist/ref/pom.xml | 15 +
.../ref/src/main/assembly/ref-assembly.xml | 7 +
7 files changed, 766 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/8ede3bf7/odata2-dist/janos/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/janos/pom.xml b/odata2-dist/janos/pom.xml
new file mode 100644
index 0000000..f6a3f81
--- /dev/null
+++ b/odata2-dist/janos/pom.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under
+ the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may
+ obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to
+ in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+ ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under
+ the License. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>olingo-odata2-dist-janos-incubating</artifactId>
+ <packaging>pom</packaging>
+ <name>${project.artifactId}</name>
+
+ <parent>
+ <groupId>org.apache.olingo</groupId>
+ <artifactId>olingo-odata2-dist-incubating</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>apache-release</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+ <id>package-assemblies</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <attach>true</attach>
+ <appendAssemblyId>true</appendAssemblyId>
+ <descriptors>
+ <descriptor>
+ src/main/assembly/janos-assembly.xml
+ </descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.olingo</groupId>
+ <artifactId>olingo-odata2-api-annotation-incubating</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.olingo</groupId>
+ <artifactId>olingo-odata2-api-incubating</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.olingo</groupId>
+ <artifactId>olingo-odata2-core-incubating</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.olingo</groupId>
+ <artifactId>olingo-odata2-annotation-processor-api-incubating</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.olingo</groupId>
+ <artifactId>olingo-odata2-annotation-processor-core-incubating</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/8ede3bf7/odata2-dist/janos/src/main/assembly/janos-assembly.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/janos/src/main/assembly/janos-assembly.xml b/odata2-dist/janos/src/main/assembly/janos-assembly.xml
new file mode 100644
index 0000000..9abb225
--- /dev/null
+++ b/odata2-dist/janos/src/main/assembly/janos-assembly.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under
+ the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may
+ obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to
+ in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+ ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under
+ the License. -->
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+ <id>janos</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory></outputDirectory>
+ <outputFileNameMapping>${artifact.groupId}-${artifact.artifactId}-${artifact.version}.${artifact.extension}</outputFileNameMapping>
+ <unpack>false</unpack>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ <useTransitiveFiltering>true</useTransitiveFiltering>
+ <scope>compile</scope>
+ <includes>
+ <include>org.apache.olingo:olingo-odata2-core-incubating</include>
+ <include>org.apache.olingo:olingo-odata2-api-incubating</include>
+ <include>org.apache.olingo:olingo-odata2-api-annotation-incubating</include>
+ <include>org.apache.olingo:olingo-odata2-annotation-processor-api-incubating</include>
+ <include>org.apache.olingo:olingo-odata2-annotation-processor-core-incubating</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+ <fileSets>
+ <fileSet>
+ <directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>LICENSE</exclude>
+ <exclude>NOTICE</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/resources</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/8ede3bf7/odata2-dist/janos/src/main/resources/LICENSE
----------------------------------------------------------------------
diff --git a/odata2-dist/janos/src/main/resources/LICENSE b/odata2-dist/janos/src/main/resources/LICENSE
new file mode 100644
index 0000000..932a86e
--- /dev/null
+++ b/odata2-dist/janos/src/main/resources/LICENSE
@@ -0,0 +1,587 @@
+
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+
+
+=====================================================================
+ - javax.ws.rs-api (http://jax-rs-spec.java.net)
+ javax.ws.rs:javax.ws.rs-api:jar:2.0-m10
+ License: CDDL 1.1 (https://glassfish.java.net/public/CDDL+GPL_1_1.html)
+=====================================================================
+
+ COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)Version 1.1
+
+ 1. Definitions.
+
+ 1.1. “Contributor” means each individual or entity that creates
+ or contributes to the creation of Modifications.
+
+ 1.2. “Contributor Version” means the combination of the Original
+ Software, prior Modifications used by a Contributor (if any), and
+ the Modifications made by that particular Contributor.
+
+ 1.3. “Covered Software” means (a) the Original Software, or (b)
+ Modifications, or (c) the combination of files containing
+ Original Software with files containing Modifications, in each
+ case including portions thereof.
+
+ 1.4. “Executable” means the Covered Software in any form other
+ than Source Code.
+
+ 1.5. “Initial Developer” means the individual or entity that
+ first makes Original Software available under this License.
+
+ 1.6. “Larger Work” means a work which combines Covered Software
+ or portions thereof with code not governed by the terms of this
+ License.
+
+ 1.7. “License” means this document.
+
+ 1.8. “Licensable” means having the right to grant, to the maximum
+ extent possible, whether at the time of the initial grant or
+ subsequently acquired, any and all of the rights conveyed herein.
+
+ 1.9. “Modifications” means the Source Code and Executable form of
+ any of the following:
+
+ A. Any file that results from an addition to, deletion from or
+ modification of the contents of a file containing Original
+ Software or previous Modifications;
+
+ B. Any new file that contains any part of the Original Software
+ or previous Modification; or
+
+ C. Any new file that is contributed or otherwise made available
+ under the terms of this License.
+
+ 1.10. “Original Software” means the Source Code and Executable
+ form of computer software code that is originally released under
+ this License.
+
+ 1.11. “Patent Claims” means any patent claim(s), now owned or
+ hereafter acquired, including without limitation, method,
+ process, and apparatus claims, in any patent Licensable by
+ grantor.
+
+ 1.12. “Source Code” means (a) the common form of computer
+ software code in which modifications are made and (b) associated
+ documentation included in or with such code.
+
+ 1.13. “You” (or “Your”) means an individual or a legal entity
+ exercising rights under, and complying with all of the terms of,
+ this License. For legal entities, “You” includes any entity which
+ controls, is controlled by, or is under common control with You.
+ For purposes of this definition, “control” means (a) the power,
+ direct or indirect, to cause the direction or management of such
+ entity, whether by contract or otherwise, or (b) ownership of
+ more than fifty percent (50%) of the outstanding shares or
+ beneficial ownership of such entity.
+
+ 2. License Grants.
+
+ 2.1. The Initial Developer Grant.
+
+ Conditioned upon Your compliance with Section 3.1 below and
+ subject to third party intellectual property claims, the Initial
+ Developer hereby grants You a world-wide, royalty-free,
+ non-exclusive license:
+
+ (a) under intellectual property rights (other than patent or
+ trademark) Licensable by Initial Developer, to use, reproduce,
+ modify, display, perform, sublicense and distribute the Original
+ Software (or portions thereof), with or without Modifications,
+ and/or as part of a Larger Work; and
+
+ (b) under Patent Claims infringed by the making, using or selling
+ of Original Software, to make, have made, use, practice, sell,
+ and offer for sale, and/or otherwise dispose of the Original
+ Software (or portions thereof).
+
+ (c) The licenses granted in Sections 2.1(a) and (b) are effective
+ on the date Initial Developer first distributes or otherwise
+ makes the Original Software available to a third party under the
+ terms of this License.
+
+ (d) Notwithstanding Section 2.1(b) above, no patent license is
+ granted: (1) for code that You delete from the Original Software,
+ or (2) for infringements caused by: (i) the modification of the
+ Original Software, or (ii) the combination of the Original
+ Software with other software or devices.
+
+ 2.2. Contributor Grant.
+
+ Conditioned upon Your compliance with Section 3.1 below and
+ subject to third party intellectual property claims, each
+ Contributor hereby grants You a world-wide, royalty-free,
+ non-exclusive license:
+
+ (a) under intellectual property rights (other than patent or
+ trademark) Licensable by Contributor to use, reproduce, modify,
+ display, perform, sublicense and distribute the Modifications
+ created by such Contributor (or portions thereof), either on an
+ unmodified basis, with other Modifications, as Covered Software
+ and/or as part of a Larger Work; and
+
+ (b) under Patent Claims infringed by the making, using, or
+ selling of Modifications made by that Contributor either alone
+ and/or in combination with its Contributor Version (or portions
+ of such combination), to make, use, sell, offer for sale, have
+ made, and/or otherwise dispose of: (1) Modifications made by that
+ Contributor (or portions thereof); and (2) the combination of
+ Modifications made by that Contributor with its Contributor
+ Version (or portions of such combination).
+
+ (c) The licenses granted in Sections 2.2(a) and 2.2(b) are
+ effective on the date Contributor first distributes or otherwise
+ makes the Modifications available to a third party.
+
+ (d) Notwithstanding Section 2.2(b) above, no patent license is
+ granted: (1) for any code that Contributor has deleted from the
+ Contributor Version; (2) for infringements caused by: (i) third
+ party modifications of Contributor Version, or (ii) the
+ combination of Modifications made by that Contributor with other
+ software (except as part of the Contributor Version) or other
+ devices; or (3) under Patent Claims infringed by Covered Software
+ in the absence of Modifications made by that Contributor.
+
+ 3. Distribution Obligations.
+
+ 3.1. Availability of Source Code.
+
+ Any Covered Software that You distribute or otherwise make
+ available in Executable form must also be made available in
+ Source Code form and that Source Code form must be distributed
+ only under the terms of this License. You must include a copy of
+ this License with every copy of the Source Code form of the
+ Covered Software You distribute or otherwise make available. You
+ must inform recipients of any such Covered Software in Executable
+ form as to how they can obtain such Covered Software in Source
+ Code form in a reasonable manner on or through a medium
+ customarily used for software exchange.
+
+ 3.2. Modifications.
+
+ The Modifications that You create or to which You contribute are
+ governed by the terms of this License. You represent that You
+ believe Your Modifications are Your original creation(s) and/or
+ You have sufficient rights to grant the rights conveyed by this
+ License.
+
+ 3.3. Required Notices.
+
+ You must include a notice in each of Your Modifications that
+ identifies You as the Contributor of the Modification. You may
+ not remove or alter any copyright, patent or trademark notices
+ contained within the Covered Software, or any notices of
+ licensing or any descriptive text giving attribution to any
+ Contributor or the Initial Developer.
+
+ 3.4. Application of Additional Terms.
+
+ You may not offer or impose any terms on any Covered Software in
+ Source Code form that alters or restricts the applicable version
+ of this License or the recipients' rights hereunder. You may
+ choose to offer, and to charge a fee for, warranty, support,
+ indemnity or liability obligations to one or more recipients of
+ Covered Software. However, you may do so only on Your own behalf,
+ and not on behalf of the Initial Developer or any Contributor.
+ You must make it absolutely clear that any such warranty,
+ support, indemnity or liability obligation is offered by You
+ alone, and You hereby agree to indemnify the Initial Developer
+ and every Contributor for any liability incurred by the Initial
+ Developer or such Contributor as a result of warranty, support,
+ indemnity or liability terms You offer.
+
+ 3.5. Distribution of Executable Versions.
+
+ You may distribute the Executable form of the Covered Software
+ under the terms of this License or under the terms of a license
+ of Your choice, which may contain terms different from this
+ License, provided that You are in compliance with the terms of
+ this License and that the license for the Executable form does
+ not attempt to limit or alter the recipient's rights in the
+ Source Code form from the rights set forth in this License. If
+ You distribute the Covered Software in Executable form under a
+ different license, You must make it absolutely clear that any
+ terms which differ from this License are offered by You alone,
+ not by the Initial Developer or Contributor. You hereby agree to
+ indemnify the Initial Developer and every Contributor for any
+ liability incurred by the Initial Developer or such Contributor
+ as a result of any such terms You offer.
+
+ 3.6. Larger Works.
+
+ You may create a Larger Work by combining Covered Software with
+ other code not governed by the terms of this License and
+ distribute the Larger Work as a single product. In such a case,
+ You must make sure the requirements of this License are fulfilled
+ for the Covered Software.
+
+ 4. Versions of the License.
+
+ 4.1. New Versions.
+
+ Oracle is the initial license steward and may publish revised
+ and/or new versions of this License from time to time. Each
+ version will be given a distinguishing version number. Except as
+ provided in Section 4.3, no one other than the license steward
+ has the right to modify this License.
+
+ 4.2. Effect of New Versions.
+
+ You may always continue to use, distribute or otherwise make the
+ Covered Software available under the terms of the version of the
+ License under which You originally received the Covered Software.
+ If the Initial Developer includes a notice in the Original
+ Software prohibiting it from being distributed or otherwise made
+ available under any subsequent version of the License, You must
+ distribute and make the Covered Software available under the
+ terms of the version of the License under which You originally
+ received the Covered Software. Otherwise, You may also choose to
+ use, distribute or otherwise make the Covered Software available
+ under the terms of any subsequent version of the License
+ published by the license steward.
+
+ 4.3. Modified Versions.
+
+ When You are an Initial Developer and You want to create a new
+ license for Your Original Software, You may create and use a
+ modified version of this License if You: (a) rename the license
+ and remove any references to the name of the license steward
+ (except to note that the license differs from this License); and
+ (b) otherwise make it clear that the license contains terms which
+ differ from this License.
+
+ 5. DISCLAIMER OF WARRANTY.
+
+ COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN “AS IS”
+ BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
+ INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED
+ SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR
+ PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND
+ PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY
+ COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE
+ INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF
+ ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF
+ WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
+ ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
+ DISCLAIMER.
+
+ 6. TERMINATION.
+
+ 6.1. This License and the rights granted hereunder will terminate
+ automatically if You fail to comply with terms herein and fail to
+ cure such breach within 30 days of becoming aware of the breach.
+ Provisions which, by their nature, must remain in effect beyond
+ the termination of this License shall survive.
+
+ 6.2. If You assert a patent infringement claim (excluding
+ declaratory judgment actions) against Initial Developer or a
+ Contributor (the Initial Developer or Contributor against whom
+ You assert such claim is referred to as “Participant”) alleging
+ that the Participant Software (meaning the Contributor Version
+ where the Participant is a Contributor or the Original Software
+ where the Participant is the Initial Developer) directly or
+ indirectly infringes any patent, then any and all rights granted
+ directly or indirectly to You by such Participant, the Initial
+ Developer (if the Initial Developer is not the Participant) and
+ all Contributors under Sections 2.1 and/or 2.2 of this License
+ shall, upon 60 days notice from Participant terminate
+ prospectively and automatically at the expiration of such 60 day
+ notice period, unless if within such 60 day period You withdraw
+ Your claim with respect to the Participant Software against such
+ Participant either unilaterally or pursuant to a written
+ agreement with Participant.
+
+ 6.3. If You assert a patent infringement claim against
+ Participant alleging that the Participant Software directly or
+ indirectly infringes any patent where such claim is resolved
+ (such as by license or settlement) prior to the initiation of
+ patent infringement litigation, then the reasonable value of the
+ licenses granted by such Participant under Sections 2.1 or 2.2
+ shall be taken into account in determining the amount or value of
+ any payment or license.
+
+ 6.4. In the event of termination under Sections 6.1 or 6.2 above,
+ all end user licenses that have been validly granted by You or
+ any distributor hereunder prior to termination (excluding
+ licenses granted to You by any distributor) shall survive
+ termination.
+
+ 7. LIMITATION OF LIABILITY.
+
+ UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+ (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE
+ INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
+ COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE
+ LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
+ CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
+ LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER
+ FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES
+ OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE
+ POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL
+ NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING
+ FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
+ PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
+ EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES,
+ SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+
+ 8. U.S. GOVERNMENT END USERS.
+
+ The Covered Software is a “commercial item,” as that term is
+ defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of “commercial
+ computer software” (as that term is defined at 48 C.F.R. §
+ 252.227-7014(a)(1)) and “commercial computer software
+ documentation” as such terms are used in 48 C.F.R. 12.212 (Sept.
+ 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
+ through 227.7202-4 (June 1995), all U.S. Government End Users
+ acquire Covered Software with only those rights set forth herein.
+ This U.S. Government Rights clause is in lieu of, and supersedes,
+ any other FAR, DFAR, or other clause or provision that addresses
+ Government rights in computer software under this License.
+
+ 9. MISCELLANEOUS.
+
+ This License represents the complete agreement concerning subject
+ matter hereof. If any provision of this License is held to be
+ unenforceable, such provision shall be reformed only to the
+ extent necessary to make it enforceable. This License shall be
+ governed by the law of the jurisdiction specified in a notice
+ contained within the Original Software (except to the extent
+ applicable law, if any, provides otherwise), excluding such
+ jurisdiction's conflict-of-law provisions. Any litigation
+ relating to this License shall be subject to the jurisdiction of
+ the courts located in the jurisdiction and venue specified in a
+ notice contained within the Original Software, with the losing
+ party responsible for costs, including, without limitation, court
+ costs and reasonable attorneys' fees and expenses. The
+ application of the United Nations Convention on Contracts for the
+ International Sale of Goods is expressly excluded. Any law or
+ regulation which provides that the language of a contract shall
+ be construed against the drafter shall not apply to this License.
+ You agree that You alone are responsible for compliance with the
+ United States export administration regulations (and the export
+ control laws and regulation of any other countries) when You use,
+ distribute or otherwise make available any Covered Software.
+
+ 10. RESPONSIBILITY FOR CLAIMS.
+
+ As between Initial Developer and the Contributors, each party is
+ responsible for claims and damages arising, directly or
+ indirectly, out of its utilization of rights under this License
+ and You agree to work with Initial Developer and Contributors to
+ distribute such responsibility on an equitable basis. Nothing
+ herein is intended or shall be deemed to constitute any admission
+ of liability.
+
+ NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND
+ DISTRIBUTION LICENSE (CDDL)
+
+ The code released under the CDDL shall be governed by the laws of
+ the State of California (excluding conflict-of-law provisions).
+ Any litigation relating to this License shall be subject to the
+ jurisdiction of the Federal Courts of the Northern District of
+ California and the state courts of the State of California, with
+ venue lying in Santa Clara County, California.
+
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/8ede3bf7/odata2-dist/janos/src/main/resources/NOTICE
----------------------------------------------------------------------
diff --git a/odata2-dist/janos/src/main/resources/NOTICE b/odata2-dist/janos/src/main/resources/NOTICE
new file mode 100644
index 0000000..7aff19d
--- /dev/null
+++ b/odata2-dist/janos/src/main/resources/NOTICE
@@ -0,0 +1,5 @@
+Apache Olingo (Incubating)
+ Copyright 2013 The Apache Software Foundation
+
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/8ede3bf7/odata2-dist/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/pom.xml b/odata2-dist/pom.xml
index 1e0769b..42f9705 100644
--- a/odata2-dist/pom.xml
+++ b/odata2-dist/pom.xml
@@ -24,6 +24,7 @@
<modules>
<module>lib</module>
<module>jpa</module>
+ <module>janos</module>
<module>ref</module>
<module>javadoc</module>
</modules>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/8ede3bf7/odata2-dist/ref/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/ref/pom.xml b/odata2-dist/ref/pom.xml
index acac25e..f6c0a42 100644
--- a/odata2-dist/ref/pom.xml
+++ b/odata2-dist/ref/pom.xml
@@ -100,6 +100,21 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.olingo</groupId>
+ <artifactId>olingo-odata2-annotation-processor-api-incubating</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.olingo</groupId>
+ <artifactId>olingo-odata2-annotation-processor-core-incubating</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.olingo</groupId>
+ <artifactId>olingo-odata2-annotation-processor-ref-incubating</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.1</version>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/8ede3bf7/odata2-dist/ref/src/main/assembly/ref-assembly.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/ref/src/main/assembly/ref-assembly.xml b/odata2-dist/ref/src/main/assembly/ref-assembly.xml
index ce6f906..b875f62 100644
--- a/odata2-dist/ref/src/main/assembly/ref-assembly.xml
+++ b/odata2-dist/ref/src/main/assembly/ref-assembly.xml
@@ -33,6 +33,13 @@
</includes>
</fileSet>
<fileSet>
+ <outputDirectory>/</outputDirectory>
+ <directory>${basedir}/../../odata2-annotation-processor/annotation-processor-web/target/</directory>
+ <includes>
+ <include>**/*.war</include>
+ </includes>
+ </fileSet>
+ <fileSet>
<directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
<outputDirectory>/</outputDirectory>
<excludes>
[14/14] git commit: [OLINGO-117] merge from origin/master
Posted by sk...@apache.org. [OLINGO-117] merge from origin/master
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/commit/674f0fa7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/674f0fa7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/674f0fa7
Branch: refs/heads/olingo-117
Commit: 674f0fa7483dacbeaa6be90b391deb2653c3db9c
Parents: 38d06b2 416537b
Author: Stephan Klevenz <sk...@apache.org>
Authored: Thu Jan 23 17:31:40 2014 +0100
Committer: Stephan Klevenz <sk...@apache.org>
Committed: Thu Jan 23 17:31:40 2014 +0100
----------------------------------------------------------------------
.../processor/api/AnnotationServiceFactory.java | 2 +-
.../core/datasource/AnnotationInMemoryDs.java | 9 +-
.../datasource/AnnotationsInMemoryDsTest.java | 65 ++
.../core/datasource/BeanPropertyAccessTest.java | 102 ++--
.../processor/core/util/ClassHelperTest.java | 12 +
odata2-dist/janos/pom.xml | 103 ++++
.../janos/src/main/assembly/janos-assembly.xml | 48 ++
odata2-dist/janos/src/main/resources/LICENSE | 587 +++++++++++++++++++
odata2-dist/janos/src/main/resources/NOTICE | 5 +
.../lib/src/main/assembly/lib-assembly.xml | 4 +-
odata2-dist/pom.xml | 1 +
odata2-dist/ref/pom.xml | 15 +
.../ref/src/main/assembly/ref-assembly.xml | 9 +-
.../processor/api/ODataJPAResponseBuilder.java | 6 +-
.../jpa/processor/api/access/JPAProcessor.java | 8 +-
.../core/ODataJPAProcessorDefault.java | 4 +-
.../core/ODataJPAResponseBuilderDefault.java | 70 +--
.../processor/core/access/data/JPAEntity.java | 163 ++---
.../core/access/data/JPAEntityParser.java | 389 ++++++------
.../core/access/data/JPAExpandCallBack.java | 47 +-
.../jpa/processor/core/access/data/JPALink.java | 70 ++-
.../core/access/data/JPAProcessorImpl.java | 19 +-
.../core/access/data/JPAEntityParserTest.java | 50 +-
.../JPAEntityParserTestForStaticMethods.java | 18 +-
.../core/access/data/JPAEntityTest.java | 3 +-
.../processor/core/mock/data/EdmMockUtil.java | 16 +-
.../processor/core/mock/data/EdmMockUtilV2.java | 3 +-
.../core/mock/data/ODataEntryMockUtil.java | 34 +-
.../processor/ref/model/SalesOrderHeader.java | 16 +-
.../jpa/processor/ref/model/SalesOrderItem.java | 13 +-
pom.xml | 52 +-
31 files changed, 1404 insertions(+), 539 deletions(-)
----------------------------------------------------------------------
[13/14] git commit: [OLINGO-134] Added exclude for 'testutil' and
'ref' classes
Posted by sk...@apache.org. [OLINGO-134] Added exclude for 'testutil' and 'ref' classes
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/commit/416537b3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/416537b3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/416537b3
Branch: refs/heads/olingo-117
Commit: 416537b3d78bc9738e86562c89e0fde71bc5bfad
Parents: 39b9276
Author: Michael Bolz <mi...@apache.org>
Authored: Wed Jan 22 20:33:14 2014 +0100
Committer: Michael Bolz <mi...@apache.org>
Committed: Wed Jan 22 20:33:14 2014 +0100
----------------------------------------------------------------------
pom.xml | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/416537b3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2a86628..6a57a4c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -278,6 +278,8 @@
<instrumentation>
<excludes>
<exclude>org/apache/olingo/odata2/**/api/**/*.class</exclude>
+ <exclude>org/apache/olingo/odata2/**/ref/**/*.class</exclude>
+ <exclude>org/apache/olingo/odata2/**/testutil/**/*.class</exclude>
</excludes>
</instrumentation>
</configuration>
@@ -344,6 +346,8 @@
<exclude>**/archetype-resources/**</exclude>
<exclude>**/archetype-metadata.xml</exclude>
<exclude>**/archetype.properties</exclude>
+ <exclude>**/nb-configuration.xml</exclude>
+ <exclude>**/glassfish-web.xml</exclude>
<exclude>**/*.txt</exclude>
</excludes>
</configuration>
[02/14] git commit: [OLINGO-87] Fixed issue with annotated class
loading.
Posted by sk...@apache.org. [OLINGO-87] Fixed issue with annotated class loading.
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/commit/f6591e3d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/f6591e3d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/f6591e3d
Branch: refs/heads/olingo-117
Commit: f6591e3db0f5db61f54817c1a24c8d6f46a38a14
Parents: 1fc260e
Author: Michael Bolz <mi...@apache.org>
Authored: Sat Jan 18 08:18:36 2014 +0100
Committer: Michael Bolz <mi...@apache.org>
Committed: Sat Jan 18 08:44:40 2014 +0100
----------------------------------------------------------------------
.../core/datasource/AnnotationInMemoryDs.java | 9 +-
.../datasource/AnnotationsInMemoryDsTest.java | 131 ++++++++++++++-----
2 files changed, 103 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/f6591e3d/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationInMemoryDs.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationInMemoryDs.java b/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationInMemoryDs.java
index db5b79b..2096785 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationInMemoryDs.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationInMemoryDs.java
@@ -76,9 +76,14 @@ public class AnnotationInMemoryDs implements DataSource {
private void init(final Collection<Class<?>> annotatedClasses) throws ODataException {
try {
for (Class<?> clz : annotatedClasses) {
- DataStore<Object> dhs = (DataStore<Object>) DataStore.createInMemory(clz, persistInMemory);
String entitySetName = ANNOTATION_HELPER.extractEntitySetName(clz);
- dataStores.put(entitySetName, dhs);
+ if(entitySetName != null) {
+ DataStore<Object> dhs = (DataStore<Object>) DataStore.createInMemory(clz, persistInMemory);
+ dataStores.put(entitySetName, dhs);
+ } else if(!ANNOTATION_HELPER.isEdmAnnotated(clz)) {
+ throw new ODataException("Found not annotated class during DataStore initilization of type: "
+ + clz.getName());
+ }
}
} catch (DataStore.DataStoreException e) {
throw new ODataException("Error in DataStore initilization with message: " + e.getMessage(), e);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/f6591e3d/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationsInMemoryDsTest.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationsInMemoryDsTest.java b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationsInMemoryDsTest.java
index 3213556..ddf4ce5 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationsInMemoryDsTest.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationsInMemoryDsTest.java
@@ -20,17 +20,25 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import org.apache.olingo.odata2.annotation.processor.core.datasource.DataSource.BinaryData;
import org.apache.olingo.odata2.annotation.processor.core.edm.AnnotationEdmProvider;
import org.apache.olingo.odata2.annotation.processor.core.model.Building;
+import org.apache.olingo.odata2.annotation.processor.core.model.City;
+import org.apache.olingo.odata2.annotation.processor.core.model.Employee;
+import org.apache.olingo.odata2.annotation.processor.core.model.Location;
+import org.apache.olingo.odata2.annotation.processor.core.model.Manager;
import org.apache.olingo.odata2.annotation.processor.core.model.ModelSharedConstants;
import org.apache.olingo.odata2.annotation.processor.core.model.Photo;
+import org.apache.olingo.odata2.annotation.processor.core.model.RefBase;
import org.apache.olingo.odata2.annotation.processor.core.model.Room;
+import org.apache.olingo.odata2.annotation.processor.core.model.Team;
import org.apache.olingo.odata2.annotation.processor.core.util.AnnotationHelper;
import org.apache.olingo.odata2.api.annotation.edm.EdmKey;
import org.apache.olingo.odata2.api.annotation.edm.EdmProperty;
@@ -51,6 +59,23 @@ import org.mockito.Mockito;
*/
public class AnnotationsInMemoryDsTest {
+ final static Set<Class<?>> ANNOTATED_MODEL_CLASSES = new HashSet<Class<?>>();
+ final static Set<Class<?>> ANNOTATED_ENTITY_SET_CLASSES = new HashSet<Class<?>>();
+
+ static {
+ ANNOTATED_ENTITY_SET_CLASSES.add(Building.class);
+ ANNOTATED_ENTITY_SET_CLASSES.add(Employee.class);
+ ANNOTATED_ENTITY_SET_CLASSES.add(Manager.class);
+ ANNOTATED_ENTITY_SET_CLASSES.add(Photo.class);
+ ANNOTATED_ENTITY_SET_CLASSES.add(Room.class);
+ ANNOTATED_ENTITY_SET_CLASSES.add(Team. class);
+
+ ANNOTATED_MODEL_CLASSES.addAll(ANNOTATED_ENTITY_SET_CLASSES);
+ ANNOTATED_MODEL_CLASSES.add(Location.class);
+ ANNOTATED_MODEL_CLASSES.add(City.class);
+ ANNOTATED_MODEL_CLASSES.add(RefBase.class);
+ }
+
private final AnnotationInMemoryDs datasource;
private final AnnotationEdmProvider edmProvider;
private static final String DEFAULT_CONTAINER = ModelSharedConstants.CONTAINER_1;
@@ -59,6 +84,45 @@ public class AnnotationsInMemoryDsTest {
datasource = new AnnotationInMemoryDs(Building.class.getPackage().getName(), false);
edmProvider = new AnnotationEdmProvider(Building.class.getPackage().getName());
}
+
+ @Test
+ public void initFromPackage() throws Exception {
+ AnnotationInMemoryDs ds = new AnnotationInMemoryDs(Building.class.getPackage().getName(), false);
+ Assert.assertNotNull(ds);
+ }
+
+ @Test(expected = IllegalArgumentException.class)
+ public void initFromNotExistingPackage() throws Exception {
+ AnnotationInMemoryDs ds = new AnnotationInMemoryDs("does.not.exist", false);
+ Assert.assertNotNull(ds);
+ }
+
+ @Test
+ public void initFromPackageWithoutAnnotatedClasses() throws Exception {
+ AnnotationInMemoryDs ds = new AnnotationInMemoryDs(this.getClass().getPackage().getName(), false);
+ Assert.assertNotNull(ds);
+ }
+
+ @Test
+ public void initFromClassCollectionEntitySets() throws Exception {
+ AnnotationInMemoryDs ds = new AnnotationInMemoryDs(ANNOTATED_ENTITY_SET_CLASSES, false);
+ Assert.assertNotNull(ds);
+ }
+
+ @Test
+ public void initFromClassCollectionModel() throws Exception {
+ AnnotationInMemoryDs ds = new AnnotationInMemoryDs(ANNOTATED_MODEL_CLASSES, false);
+ Assert.assertNotNull(ds);
+ }
+
+ @Test(expected = ODataException.class)
+ public void initFromClassCollectionNotAnnotated() throws Exception {
+ Set<Class<?>> annotatedClassesAndMore = new HashSet<Class<?>>(ANNOTATED_ENTITY_SET_CLASSES);
+ annotatedClassesAndMore.add(String.class);
+ annotatedClassesAndMore.add(Object.class);
+ AnnotationInMemoryDs ds = new AnnotationInMemoryDs(annotatedClassesAndMore, false);
+ Assert.assertNotNull(ds);
+ }
@Test
@Ignore
@@ -88,6 +152,7 @@ public class AnnotationsInMemoryDsTest {
@org.apache.olingo.odata2.api.annotation.edm.EdmEntitySet
@org.apache.olingo.odata2.api.annotation.edm.EdmEntityType
private static class SimpleEntity {
+
@EdmKey
@EdmProperty
public Integer id;
@@ -119,7 +184,7 @@ public class AnnotationsInMemoryDsTest {
localDs.createData(edmEntitySet, se);
} catch (Exception ex) {
throw new RuntimeException(ex);
- }finally{
+ } finally {
latch.countDown();
}
}
@@ -140,7 +205,7 @@ public class AnnotationsInMemoryDsTest {
}
private Thread createBuildingThread(final CountDownLatch latch, final DataSource datasource,
- final EdmEntitySet edmEntitySet, final String id) {
+ final EdmEntitySet edmEntitySet, final String id) {
Runnable run = new Runnable() {
@Override
public void run() {
@@ -160,7 +225,7 @@ public class AnnotationsInMemoryDsTest {
return new Thread(run);
}
-
+
@Test
public void readBinaryData() throws Exception {
EdmEntitySet entitySet = createMockedEdmEntitySet("Photos");
@@ -178,7 +243,7 @@ public class AnnotationsInMemoryDsTest {
keys.put("Name", "SomePic");
keys.put("ImageFormat", "PNG");
Photo toReadPhoto = (Photo) datasource.readData(entitySet, keys);
-
+
// execute
BinaryData readBinaryData = datasource.readBinaryData(entitySet, toReadPhoto);
@@ -200,7 +265,7 @@ public class AnnotationsInMemoryDsTest {
photo.setImage(image);
photo.setImageType("image/png");
photoDataStore.create(photo);
-
+
Photo toReadPhoto = new Photo();
toReadPhoto.setName("SomePic");
toReadPhoto.setType("PNG");
@@ -208,13 +273,12 @@ public class AnnotationsInMemoryDsTest {
toReadPhoto.setImageType(null);
BinaryData readBinaryData = datasource.readBinaryData(entitySet, toReadPhoto);
-
+
Assert.assertEquals("binary", new String(readBinaryData.getData(), Charset.defaultCharset()));
Assert.assertArrayEquals(image, readBinaryData.getData());
Assert.assertEquals("image/png", readBinaryData.getMimeType());
}
-
@Test
public void writeBinaryData() throws Exception {
EdmEntitySet entitySet = createMockedEdmEntitySet("Photos");
@@ -241,7 +305,7 @@ public class AnnotationsInMemoryDsTest {
Assert.assertEquals("image/png", storedPhoto.getImageType());
}
- @Test(expected=ODataNotFoundException.class)
+ @Test(expected = ODataNotFoundException.class)
public void writeBinaryDataNotFound() throws Exception {
EdmEntitySet entitySet = createMockedEdmEntitySet("Photos");
@@ -255,12 +319,11 @@ public class AnnotationsInMemoryDsTest {
datasource.writeBinaryData(entitySet, toWritePhoto, writeBinaryData);
}
-
@Test
public void newDataObject() throws Exception {
EdmEntitySet roomsEntitySet = createMockedEdmEntitySet("Rooms");
Room room = (Room) datasource.newDataObject(roomsEntitySet);
-
+
Assert.assertNotNull(room);
}
@@ -294,7 +357,7 @@ public class AnnotationsInMemoryDsTest {
Building readBuilding = (Building) relatedData;
Assert.assertEquals("Common Building", readBuilding.getName());
Assert.assertEquals("1", readBuilding.getId());
-
+
Collection<Room> relatedRooms = readBuilding.getRooms();
Assert.assertEquals(roomsCount, relatedRooms.size());
for (Room room : relatedRooms) {
@@ -304,7 +367,7 @@ public class AnnotationsInMemoryDsTest {
}
}
- @Test(expected=ODataRuntimeException.class)
+ @Test(expected = ODataRuntimeException.class)
public void readUnknownEntity() throws Exception {
EdmEntitySet unknownEntitySet = Mockito.mock(EdmEntitySet.class);
Mockito.when(unknownEntitySet.getName()).thenReturn("UnknownEntity");
@@ -315,7 +378,7 @@ public class AnnotationsInMemoryDsTest {
datasource.readData(unknownEntitySet, keys);
}
- @Test(expected=ODataRuntimeException.class)
+ @Test(expected = ODataRuntimeException.class)
public void readUnknownEntities() throws Exception {
EdmEntitySet unknownEntitySet = Mockito.mock(EdmEntitySet.class);
Mockito.when(unknownEntitySet.getName()).thenReturn("UnknownEntity");
@@ -354,7 +417,6 @@ public class AnnotationsInMemoryDsTest {
}
}
-
@Test
@SuppressWarnings("unchecked")
public void readRelatedEntities() throws Exception {
@@ -385,7 +447,7 @@ public class AnnotationsInMemoryDsTest {
// execute
Object relatedData = datasource.readRelatedData(
- buildingsEntitySet, building, roomsEntitySet, Collections.EMPTY_MAP);
+ buildingsEntitySet, building, roomsEntitySet, Collections.EMPTY_MAP);
// validate
Assert.assertTrue("Result is no collection.", relatedData instanceof Collection);
@@ -417,10 +479,10 @@ public class AnnotationsInMemoryDsTest {
Room read = (Room) datasource.readData(roomsEntitySet, keys);
Assert.assertEquals("Room 12", read.getName());
Assert.assertEquals("12", read.getId());
-
+
// execute
Object relatedData = datasource.readRelatedData(
- roomsEntitySet, room, buildingsEntitySet, Collections.EMPTY_MAP);
+ roomsEntitySet, room, buildingsEntitySet, Collections.EMPTY_MAP);
// validate
Assert.assertTrue("Result is no room.", relatedData instanceof Building);
@@ -450,7 +512,7 @@ public class AnnotationsInMemoryDsTest {
// execute
Object relatedData = datasource.readRelatedData(
- roomsEntitySet, room, buildingsEntitySet, Collections.EMPTY_MAP);
+ roomsEntitySet, room, buildingsEntitySet, Collections.EMPTY_MAP);
// validate
Assert.assertNull("Related data must be null.", relatedData);
@@ -487,7 +549,7 @@ public class AnnotationsInMemoryDsTest {
Map<String, Object> targetKeys = new HashMap<String, Object>();
targetKeys.put("Id", 3);
Object relatedData = datasource.readRelatedData(
- buildingsEntitySet, building, roomsEntitySet, targetKeys);
+ buildingsEntitySet, building, roomsEntitySet, targetKeys);
// validate
Assert.assertTrue("Result is no Room.", relatedData instanceof Room);
@@ -622,8 +684,7 @@ public class AnnotationsInMemoryDsTest {
Assert.assertEquals("image/jpg", readUpdated.getImageType());
Assert.assertEquals("https://localhost/image.jpg", readUpdated.getImageUri());
}
-
-
+
@Test
public void deleteSimpleEntity() throws Exception {
EdmEntitySet edmEntitySet = createMockedEdmEntitySet("Buildings");
@@ -642,15 +703,16 @@ public class AnnotationsInMemoryDsTest {
//
datasource.deleteData(edmEntitySet, keys);
-
+
// validate
try {
Building readAfterDelete = (Building) datasource.readData(edmEntitySet, keys);
Assert.fail("Expected " + ODataNotFoundException.class + "was not thrown for '" + readAfterDelete + "'.");
- } catch (ODataNotFoundException e) { }
+ } catch (ODataNotFoundException e) {
+ }
}
- @Test(expected=ODataRuntimeException.class)
+ @Test(expected = ODataRuntimeException.class)
public void unknownEntitySetForEntity() throws Exception {
String entitySetName = "Unknown";
FullQualifiedName entityType = new FullQualifiedName(DEFAULT_CONTAINER, entitySetName);
@@ -660,14 +722,14 @@ public class AnnotationsInMemoryDsTest {
EdmEntityType edmEntityType = Mockito.mock(EdmEntityType.class);
Mockito.when(edmEntitySet.getEntityType()).thenReturn(edmEntityType);
Mockito.when(edmEntityType.getName()).thenReturn(entityType.getName());
-
+
Map<String, Object> keys = new HashMap<String, Object>();
keys.put("Id", "1");
//
datasource.readData(edmEntitySet, keys);
}
- @Test(expected=ODataRuntimeException.class)
+ @Test(expected = ODataRuntimeException.class)
public void unknownEntitySetForEntities() throws Exception {
String entitySetName = "Unknown";
FullQualifiedName entityType = new FullQualifiedName(DEFAULT_CONTAINER, entitySetName);
@@ -677,12 +739,11 @@ public class AnnotationsInMemoryDsTest {
EdmEntityType edmEntityType = Mockito.mock(EdmEntityType.class);
Mockito.when(edmEntitySet.getEntityType()).thenReturn(edmEntityType);
Mockito.when(edmEntityType.getName()).thenReturn(entityType.getName());
-
+
//
datasource.readData(edmEntitySet);
}
-
@Test
public void writeRelations() throws Exception {
DataStore<Building> buildingStore = DataStore.createInMemory(Building.class, true);
@@ -699,33 +760,33 @@ public class AnnotationsInMemoryDsTest {
room.setSeats(123);;
room.setVersion(4711);
roomStore.create(room);
-
+
Map<String, Object> targetEntityKeyValues = new HashMap<String, Object>();
targetEntityKeyValues.put("Id", 42);
-
+
// execute
datasource.writeRelation(buildingsEntitySet, building, roomsEntitySet, targetEntityKeyValues);
-
+
// validate
Building readBuilding = buildingStore.read(created);
Room readRoom = roomStore.read(new Room(42, ""));
-
+
List<Room> readRooms = readBuilding.getRooms();
Assert.assertEquals(1, readRooms.size());
Assert.assertEquals(readRoom, readRooms.get(0));
-
+
Assert.assertEquals("42", readRoom.getId());
Assert.assertEquals(123, readRoom.getSeats());
Assert.assertEquals(4711, readRoom.getVersion());
Assert.assertEquals(readBuilding, readRoom.getBuilding());
}
-
+
private EdmEntitySet createMockedEdmEntitySet(final String entitySetName) throws ODataException {
return createMockedEdmEntitySet(edmProvider, entitySetName);
}
private EdmEntitySet createMockedEdmEntitySet(AnnotationEdmProvider edmProvider, final String entitySetName)
- throws ODataException {
+ throws ODataException {
EntitySet entitySet = edmProvider.getEntitySet(DEFAULT_CONTAINER, entitySetName);
FullQualifiedName entityType = entitySet.getEntityType();
[07/14] git commit: [OLINGO-71] cleanup before release candidate
Posted by sk...@apache.org. [OLINGO-71] cleanup before release candidate
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/commit/b88fc592
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/b88fc592
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/b88fc592
Branch: refs/heads/olingo-117
Commit: b88fc592c41843c7a90671416aac296c1e4f6268
Parents: 8ede3bf
Author: Christian Amend <ch...@apache.org>
Authored: Tue Jan 21 15:13:50 2014 +0100
Committer: Christian Amend <ch...@apache.org>
Committed: Tue Jan 21 15:13:50 2014 +0100
----------------------------------------------------------------------
.../processor/api/AnnotationServiceFactory.java | 36 +++----
.../core/AnnotationServiceFactoryImpl.java | 4 +-
.../processor/core/ListsProcessor.java | 8 +-
.../core/datasource/AnnotationInMemoryDs.java | 12 +--
.../core/datasource/AnnotationValueAccess.java | 2 +-
.../processor/core/datasource/DataStore.java | 20 ++--
.../processor/core/util/AnnotationHelper.java | 10 +-
.../processor/core/util/ClassHelper.java | 7 +-
.../core/AnnotationServiceFactoryImplTest.java | 12 +--
.../processor/core/ListsProcessorTest.java | 8 +-
.../datasource/AnnotationValueAccessTest.java | 78 +++++++-------
.../datasource/AnnotationsInMemoryDsTest.java | 26 ++---
.../core/datasource/BeanPropertyAccessTest.java | 102 ++++++++++---------
.../processor/core/model/Building.java | 2 +-
.../annotation/processor/core/model/Room.java | 2 +-
.../core/util/AnnotationHelperTest.java | 32 +++---
.../processor/core/util/ClassHelperTest.java | 9 +-
.../ref/AnnotationRefServiceFactory.java | 6 +-
.../processor/ref/ServiceJsonTest.java | 4 +-
.../processor/ref/ServiceXmlTest.java | 2 +-
.../processor/core/access/data/JPAEntity.java | 14 +--
.../core/access/data/JPAEntityParser.java | 13 ++-
.../core/access/data/JPAExpandCallBack.java | 2 +-
.../jpa/processor/core/access/data/JPALink.java | 2 +-
.../processor/core/mock/data/EdmMockUtil.java | 2 +-
.../core/mock/data/ODataEntryMockUtil.java | 2 +-
.../jpa/processor/ref/model/SalesOrderItem.java | 2 +-
.../odata2/ref/processor/ListsProcessor.java | 12 +--
.../ref/processor/ScenarioDataSource.java | 2 +-
.../ref/processor/ListsProcessorTest.java | 6 +-
30 files changed, 223 insertions(+), 216 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-annotation-processor/annotation-processor-api/src/main/java/org/apache/olingo/odata2/annotation/processor/api/AnnotationServiceFactory.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-api/src/main/java/org/apache/olingo/odata2/annotation/processor/api/AnnotationServiceFactory.java b/odata2-annotation-processor/annotation-processor-api/src/main/java/org/apache/olingo/odata2/annotation/processor/api/AnnotationServiceFactory.java
index 38fe73a..aa03f38 100644
--- a/odata2-annotation-processor/annotation-processor-api/src/main/java/org/apache/olingo/odata2/annotation/processor/api/AnnotationServiceFactory.java
+++ b/odata2-annotation-processor/annotation-processor-api/src/main/java/org/apache/olingo/odata2/annotation/processor/api/AnnotationServiceFactory.java
@@ -30,7 +30,7 @@ import org.apache.olingo.odata2.api.exception.ODataException;
*/
public abstract class AnnotationServiceFactory {
- private static final String IMPLEMENTATION =
+ private static final String IMPLEMENTATION =
"org.apache.olingo.odata2.annotation.processor.core.AnnotationServiceFactoryImpl";
/**
@@ -59,60 +59,62 @@ public abstract class AnnotationServiceFactory {
/**
* Interface to be implemented for an instance of a {@link AnnotationServiceFactoryInstance} which
- * provides an {@link ODataService} based on annotation from
+ * provides an {@link ODataService} based on annotation from
* <code>org.apache.olingo.olingo-odata2-api-annotation</code> module
* (see package <code>org.apache.olingo.odata2.api.annotation.edm</code>).
*/
public interface AnnotationServiceFactoryInstance {
/**
- * Create an {@link ODataService} which is based on an EDM and Processor which are using the annotations from
+ * Create an {@link ODataService} which is based on an EDM and Processor which are using the annotations from
* <code>org.apache.olingo.olingo-odata2-api-annotation</code> module
* (see package <code>org.apache.olingo.odata2.api.annotation.edm</code>) to define the model and access the data.
*
* @param modelPackage package name which is scanned for annotated classes
- * @return service an {@link ODataService} based on on an EDM and Processor which are using annotations
- * for model definition and data access.
+ * @return service an {@link ODataService} based on on an EDM and Processor which are using annotations
+ * for model definition and data access.
* @throws ODataException if an error during initialization occurs
*/
public ODataService createAnnotationService(String modelPackage) throws ODataException;
+
/**
- * Create an {@link ODataService} which is based on an EDM and Processor which are using the annotations from
+ * Create an {@link ODataService} which is based on an EDM and Processor which are using the annotations from
* <code>org.apache.olingo.olingo-odata2-api-annotation</code> module
* (see package <code>org.apache.olingo.odata2.api.annotation.edm</code>) to define the model and access the data.
*
* @param modelPackage classes (which are annotated) which will be used for EDM definition and data access.
- * @return service an {@link ODataService} based on on an EDM and Processor which are using annotations
- * for model definition and data access.
+ * @return service an {@link ODataService} based on on an EDM and Processor which are using annotations
+ * for model definition and data access.
* @throws ODataException if an error during initialization occurs
*/
public ODataService createAnnotationService(Collection<Class<?>> annotatedClasses) throws ODataException;
}
/**
- * Create an {@link ODataService} which is based on an EDM and Processor which are using the annotations from
+ * Create an {@link ODataService} which is based on an EDM and Processor which are using the annotations from
* <code>org.apache.olingo.olingo-odata2-api-annotation</code> module
* (see package <code>org.apache.olingo.odata2.api.annotation.edm</code>) to define the model and access the data.
*
* @param modelPackage package name which is scanned for annotated classes
- * @return service an {@link ODataService} based on on an EDM and Processor which are using annotations
- * for model definition and data access.
+ * @return service an {@link ODataService} based on on an EDM and Processor which are using annotations
+ * for model definition and data access.
* @throws ODataException if an error during initialization occurs
*/
- public static ODataService createAnnotationService(String modelPackage) throws ODataException {
+ public static ODataService createAnnotationService(final String modelPackage) throws ODataException {
return getInstance().createAnnotationService(modelPackage);
}
-
+
/**
- * Create an {@link ODataService} which is based on an EDM and Processor which are using the annotations from
+ * Create an {@link ODataService} which is based on an EDM and Processor which are using the annotations from
* <code>org.apache.olingo.olingo-odata2-api-annotation</code> module
* (see package <code>org.apache.olingo.odata2.api.annotation.edm</code>) to define the model and access the data.
*
* @param modelPackage classes (which are annotated) which will be used for EDM definition and data access.
- * @return service an {@link ODataService} based on on an EDM and Processor which are using annotations
- * for model definition and data access.
+ * @return service an {@link ODataService} based on on an EDM and Processor which are using annotations
+ * for model definition and data access.
* @throws ODataException if an error during initialization occurs
*/
- public static ODataService createAnnotationService(Collection<Class<?>> annotatedClasses) throws ODataException {
+ public static ODataService createAnnotationService(final Collection<Class<?>> annotatedClasses)
+ throws ODataException {
return getInstance().createAnnotationService(annotatedClasses);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/AnnotationServiceFactoryImpl.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/AnnotationServiceFactoryImpl.java b/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/AnnotationServiceFactoryImpl.java
index 7947d6b..d8e0c7e 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/AnnotationServiceFactoryImpl.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/AnnotationServiceFactoryImpl.java
@@ -37,7 +37,7 @@ public class AnnotationServiceFactoryImpl implements AnnotationServiceFactoryIns
* {@inheritDoc}
*/
@Override
- public ODataService createAnnotationService(String modelPackage) throws ODataException {
+ public ODataService createAnnotationService(final String modelPackage) throws ODataException {
AnnotationEdmProvider edmProvider = new AnnotationEdmProvider(modelPackage);
AnnotationInMemoryDs dataSource = new AnnotationInMemoryDs(modelPackage);
AnnotationValueAccess valueAccess = new AnnotationValueAccess();
@@ -51,7 +51,7 @@ public class AnnotationServiceFactoryImpl implements AnnotationServiceFactoryIns
* {@inheritDoc}
*/
@Override
- public ODataService createAnnotationService(Collection<Class<?>> annotatedClasses) throws ODataException {
+ public ODataService createAnnotationService(final Collection<Class<?>> annotatedClasses) throws ODataException {
AnnotationEdmProvider edmProvider = new AnnotationEdmProvider(annotatedClasses);
AnnotationInMemoryDs dataSource = new AnnotationInMemoryDs(annotatedClasses);
AnnotationValueAccess valueAccess = new AnnotationValueAccess();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/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 7e637f9..e65fd2b 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
@@ -205,11 +205,11 @@ public class ListsProcessor extends DataSourceProcessor {
return ODataResponse.fromResponse(response).build();
}
- String percentEncodeNextLink(String link) {
- if(link == null) {
+ String percentEncodeNextLink(final String link) {
+ if (link == null) {
return null;
}
-
+
return link.replaceAll("\\$skiptoken=.+?(?:&|$)", "")
.replaceAll("\\$skip=.+?(?:&|$)", "")
.replaceFirst("(?:\\?|&)$", ""); // Remove potentially trailing "?" or "&" left over from remove actions
@@ -906,7 +906,7 @@ public class ListsProcessor extends DataSourceProcessor {
keys.isEmpty() ?
dataSource.readData(startEntitySet) : dataSource.readData(startEntitySet, keys) :
dataSource.readData(functionImport, functionImportParameters, keys);
-
+
EdmEntitySet currentEntitySet =
functionImport == null ? startEntitySet : functionImport.getEntitySet();
for (NavigationSegment navigationSegment : navigationSegments) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationInMemoryDs.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationInMemoryDs.java b/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationInMemoryDs.java
index 2096785..e83f5d1 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationInMemoryDs.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationInMemoryDs.java
@@ -50,7 +50,7 @@ public class AnnotationInMemoryDs implements DataSource {
this(annotatedClasses, true);
}
- public AnnotationInMemoryDs(final Collection<Class<?>> annotatedClasses, final boolean persistInMemory)
+ public AnnotationInMemoryDs(final Collection<Class<?>> annotatedClasses, final boolean persistInMemory)
throws ODataException {
this.persistInMemory = persistInMemory;
init(annotatedClasses);
@@ -77,12 +77,12 @@ public class AnnotationInMemoryDs implements DataSource {
try {
for (Class<?> clz : annotatedClasses) {
String entitySetName = ANNOTATION_HELPER.extractEntitySetName(clz);
- if(entitySetName != null) {
+ if (entitySetName != null) {
DataStore<Object> dhs = (DataStore<Object>) DataStore.createInMemory(clz, persistInMemory);
dataStores.put(entitySetName, dhs);
- } else if(!ANNOTATION_HELPER.isEdmAnnotated(clz)) {
- throw new ODataException("Found not annotated class during DataStore initilization of type: "
- + clz.getName());
+ } else if (!ANNOTATION_HELPER.isEdmAnnotated(clz)) {
+ throw new ODataException("Found not annotated class during DataStore initilization of type: "
+ + clz.getName());
}
}
} catch (DataStore.DataStoreException e) {
@@ -186,7 +186,7 @@ public class AnnotationInMemoryDs implements DataSource {
}
/**
- * Extract the <code>result data</code> from the <code>resultData</code> list based on
+ * Extract the <code>result data</code> from the <code>resultData</code> list based on
* <code>navigation information</code> and <code>targetKeys</code>.
*
* @param targetStore
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationValueAccess.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationValueAccess.java b/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationValueAccess.java
index cc36d2a..9989e8f 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationValueAccess.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationValueAccess.java
@@ -71,7 +71,7 @@ public class AnnotationValueAccess implements ValueAccess {
*/
@Override
public <T> Class<?> getPropertyType(final T data, final EdmProperty property) throws ODataException {
- if(data == null) {
+ if (data == null) {
return null;
} else if (annotationHelper.isEdmAnnotated(data)) {
Class<?> fieldType = annotationHelper.getFieldTypeForProperty(data, property.getName());
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/datasource/DataStore.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/datasource/DataStore.java b/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/datasource/DataStore.java
index 57b3d8c..7be4abe 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/datasource/DataStore.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/datasource/DataStore.java
@@ -138,7 +138,7 @@ public class DataStore<T> {
return dataStore.remove(keyElement);
}
}
-
+
/**
* Are the key values equal for both instances.
* If all compared key values are <code>null</code> this also means equal.
@@ -150,36 +150,34 @@ public class DataStore<T> {
public boolean isKeyEqual(final T first, final T second) {
KeyElement firstKeys = getKeys(first);
KeyElement secondKeys = getKeys(second);
-
+
return firstKeys.equals(secondKeys);
}
-
+
/**
* Are the key values equal for both instances.
* If all compared key values are <code>null</code> this also means equal.
* Before object (keys) are compared it is validated that both object instance are NOT null
* and that both are from the same class as this {@link DataStore} (see {@link #dataTypeClass}).
- * For the equal check on {@link #dataTypeClass} instances without validation see
- * {@link #isKeyEqual(Object, Object)}.
+ * For the equal check on {@link #dataTypeClass} instances without validation see {@link #isKeyEqual(Object, Object)}.
*
* @param first first instance to check for key equal
* @param second second instance to check for key equal
* @return <code>true</code> if object instance have equal keys set.
*/
@SuppressWarnings("unchecked")
- public boolean isKeyEqualChecked(Object first, Object second) throws DataStoreException {
- if(first == null || second == null) {
+ public boolean isKeyEqualChecked(final Object first, final Object second) throws DataStoreException {
+ if (first == null || second == null) {
throw new DataStoreException("Tried to compare null values which is not allowed.");
- } else if(first.getClass() != dataTypeClass) {
+ } else if (first.getClass() != dataTypeClass) {
throw new DataStoreException("First value is no instance from required class '" + dataTypeClass + "'.");
- } else if(second.getClass() != dataTypeClass) {
+ } else if (second.getClass() != dataTypeClass) {
throw new DataStoreException("Second value is no instance from required class '" + dataTypeClass + "'.");
}
-
+
return isKeyEqual((T) first, (T) second);
}
-
private class KeyElement {
private int cachedHashCode = 42;
private final List<Object> keyValues;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/util/AnnotationHelper.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/util/AnnotationHelper.java b/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/util/AnnotationHelper.java
index 54ffb49..acf1deb 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/util/AnnotationHelper.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/util/AnnotationHelper.java
@@ -63,7 +63,7 @@ public class AnnotationHelper {
Map<String, Object> firstKeyFields = getValueForAnnotatedFields(firstInstance, EdmKey.class);
Map<String, Object> secondKeyFields = getValueForAnnotatedFields(secondInstance, EdmKey.class);
- if(firstKeyFields.isEmpty() && secondKeyFields.isEmpty()) {
+ if (firstKeyFields.isEmpty() && secondKeyFields.isEmpty()) {
throw new ODataRuntimeException("Both object instances does not have EdmKey fields defined ["
+ "firstClass=" + firstInstance.getClass().getName()
+ " secondClass=" + secondInstance.getClass().getName() + "].");
@@ -87,7 +87,7 @@ public class AnnotationHelper {
private boolean keyValuesMatch(final Map<String, Object> firstKeyValues, final Map<String, Object> secondKeyValues) {
if (firstKeyValues.size() != secondKeyValues.size()) {
return false;
- } else if(firstKeyValues.isEmpty()) {
+ } else if (firstKeyValues.isEmpty()) {
throw new ODataRuntimeException("No keys given for key value matching.");
} else {
Set<Map.Entry<String, Object>> entries = firstKeyValues.entrySet();
@@ -519,9 +519,9 @@ public class AnnotationHelper {
return fieldName2Value;
}
- private String extractPropertyName(Field field) {
+ private String extractPropertyName(final Field field) {
final EdmProperty property = field.getAnnotation(EdmProperty.class);
- if(property == null || property.name().isEmpty()) {
+ if (property == null || property.name().isEmpty()) {
return getCanonicalName(field);
} else {
return property.name();
@@ -664,7 +664,7 @@ public class AnnotationHelper {
return type.getEdmSimpleTypeInstance().valueOfString(propertyValue,
EdmLiteralKind.DEFAULT, null, fieldClass);
} catch (EdmSimpleTypeException ex) {
- throw new ODataRuntimeException("Conversion failed for string property ["
+ throw new ODataRuntimeException("Conversion failed for string property ["
+ propertyValue + "] on field ["
+ field + "] with error: " + ex.getMessage(), ex);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/util/ClassHelper.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/util/ClassHelper.java b/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/util/ClassHelper.java
index 27f9cdb..66f7860 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/util/ClassHelper.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/util/ClassHelper.java
@@ -104,7 +104,7 @@ public class ClassHelper {
return annotatedClasses;
}
- private static boolean isJarFile(URL url) {
+ private static boolean isJarFile(final URL url) {
String filename = url.getFile();
int index = filename.indexOf(JAR_RESOURCE_SEPARATOR);
if (index > JAR_FILE_ENDING.length()) {
@@ -114,7 +114,8 @@ public class ClassHelper {
return false;
}
- private static Collection<String> getClassFqnFromDir(final FilenameFilter ff, File folder, String packageToScan) {
+ private static Collection<String> getClassFqnFromDir(final FilenameFilter ff, final File folder,
+ final String packageToScan) {
List<String> classFiles = new ArrayList<String>();
String[] classFilesForFolder = folder.list(ff);
for (String name : classFilesForFolder) {
@@ -130,7 +131,7 @@ public class ClassHelper {
return classFiles;
}
- private static Collection<String> getClassFqnFromJar(String filepath, String packageToScan) {
+ private static Collection<String> getClassFqnFromJar(final String filepath, final String packageToScan) {
JarFile jarFile = null;
final String jarFilePath;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/AnnotationServiceFactoryImplTest.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/AnnotationServiceFactoryImplTest.java b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/AnnotationServiceFactoryImplTest.java
index 4feaac7..ddac573 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/AnnotationServiceFactoryImplTest.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/AnnotationServiceFactoryImplTest.java
@@ -40,10 +40,10 @@ public class AnnotationServiceFactoryImplTest {
public void createFromPackage() throws ODataException {
AnnotationServiceFactoryImpl factory = new AnnotationServiceFactoryImpl();
ODataService service = factory.createAnnotationService(Building.class.getPackage().getName());
-
+
Assert.assertNotNull(service);
}
-
+
@Test
public void createFromAnnotatedClasses() throws ODataException {
AnnotationServiceFactoryImpl factory = new AnnotationServiceFactoryImpl();
@@ -56,19 +56,19 @@ public class AnnotationServiceFactoryImplTest {
annotatedClasses.add(Room.class);
annotatedClasses.add(Team.class);
ODataService service = factory.createAnnotationService(annotatedClasses);
-
+
Assert.assertNotNull(service);
}
- @Test(expected=ODataException.class)
+ @Test(expected = ODataException.class)
public void createFromClasses() throws ODataException {
AnnotationServiceFactoryImpl factory = new AnnotationServiceFactoryImpl();
-
+
final Collection<Class<?>> notAnnotatedClasses = new ArrayList<Class<?>>();
notAnnotatedClasses.add(String.class);
notAnnotatedClasses.add(Long.class);
ODataService service = factory.createAnnotationService(notAnnotatedClasses);
-
+
Assert.assertNotNull(service);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/ListsProcessorTest.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/ListsProcessorTest.java b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/ListsProcessorTest.java
index 82b857c..89c83da 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/ListsProcessorTest.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/ListsProcessorTest.java
@@ -33,16 +33,16 @@ public class ListsProcessorTest {
private ListsProcessor listsProcessor;
private DataSource mockedDataSource = Mockito.mock(DataSource.class);
private ValueAccess mockedValueAccess = Mockito.mock(ValueAccess.class);
-
+
@Test
public void init() throws ODataException {
DataSource dataSource = new AnnotationInMemoryDs(Building.class.getPackage().getName());
ValueAccess valueAccess = new AnnotationValueAccess();
ListsProcessor lp = new ListsProcessor(dataSource, valueAccess);
-
+
Assert.assertNotNull(lp);
}
-
+
public ListsProcessorTest() {
listsProcessor = new ListsProcessor(mockedDataSource, mockedValueAccess);
}
@@ -82,7 +82,7 @@ public class ListsProcessorTest {
String url = "Rooms?$orderby=Seats%20desc&$skiptoken=213&$top=200";
String result = listsProcessor.percentEncodeNextLink(url);
Assert.assertEquals("Rooms?$orderby=Seats%20desc&$top=200", result);
-
+
String url2 = "Rooms?$orderby=Seats%20desc&$skiptoken=213";
String result2 = listsProcessor.percentEncodeNextLink(url2);
Assert.assertEquals("Rooms?$orderby=Seats%20desc", result2);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationValueAccessTest.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationValueAccessTest.java b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationValueAccessTest.java
index df7b3a4..25b2fe9 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationValueAccessTest.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationValueAccessTest.java
@@ -39,7 +39,7 @@ public class AnnotationValueAccessTest {
EdmProperty property = mockProperty("Name");
Class<?> type = ava.getPropertyType(data, property);
-
+
Assert.assertEquals(String.class, type);
}
@@ -49,20 +49,18 @@ public class AnnotationValueAccessTest {
EdmProperty property = mockProperty("Name");
Class<?> type = ava.getPropertyType(null, property);
-
+
Assert.assertNull(type);
}
-
- @Test(expected=ODataNotImplementedException.class)
+ @Test(expected = ODataNotImplementedException.class)
public void getPropertyTypeNotAnnotated() throws ODataException {
AnnotationValueAccess ava = new AnnotationValueAccess();
NotAnnotatedBean data = new NotAnnotatedBean();
- data.name = "A Name";
EdmProperty property = mockProperty("Name");
Class<?> type = ava.getPropertyType(data, property);
-
+
Assert.assertEquals(String.class, type);
}
@@ -74,7 +72,7 @@ public class AnnotationValueAccessTest {
EdmProperty property = mockProperty("Name");
Object value = ava.getPropertyValue(data, property);
-
+
Assert.assertEquals(String.class, value.getClass());
Assert.assertEquals("A Name", value);
}
@@ -86,7 +84,7 @@ public class AnnotationValueAccessTest {
EdmProperty property = mockProperty("Name");
Object value = ava.getPropertyValue(data, property);
-
+
Assert.assertNull(value);
}
@@ -97,15 +95,14 @@ public class AnnotationValueAccessTest {
EdmProperty property = mockProperty("Name");
Object value = ava.getPropertyValue(data, property);
-
+
Assert.assertNull(value);
}
- @Test(expected=ODataNotImplementedException.class)
+ @Test(expected = ODataNotImplementedException.class)
public void getPropertyValueNotAnnotated() throws ODataException {
AnnotationValueAccess ava = new AnnotationValueAccess();
NotAnnotatedBean data = new NotAnnotatedBean();
- data.name = "A Name";
EdmProperty property = mockProperty("Name");
Object value = ava.getPropertyValue(data, property);
@@ -118,20 +115,19 @@ public class AnnotationValueAccessTest {
SimpleEntity data = new SimpleEntity();
data.name = "A Name";
EdmProperty property = mockProperty("Name");
-
+
Object value = "Another Name";
ava.setPropertyValue(data, property, value);
-
+
Assert.assertEquals("Another Name", data.name);
}
- @Test(expected=ODataNotImplementedException.class)
+ @Test(expected = ODataNotImplementedException.class)
public void setPropertyValueNotAnnotated() throws ODataException {
AnnotationValueAccess ava = new AnnotationValueAccess();
NotAnnotatedBean data = new NotAnnotatedBean();
- data.name = "A Name";
EdmProperty property = mockProperty("Name");
-
+
Object value = "Another Name";
ava.setPropertyValue(data, property, value);
}
@@ -142,9 +138,9 @@ public class AnnotationValueAccessTest {
SimpleEntity data = new SimpleEntity();
data.name = "A Name";
EdmProperty property = mockProperty("Name");
-
+
ava.setPropertyValue(data, property, null);
-
+
Assert.assertNull(null, data.name);
}
@@ -153,9 +149,9 @@ public class AnnotationValueAccessTest {
AnnotationValueAccess ava = new AnnotationValueAccess();
SimpleEntity data = null;
EdmProperty property = mockProperty("Name");
-
+
ava.setPropertyValue(data, property, null);
-
+
// no exception is thrown, all fine
}
@@ -165,9 +161,9 @@ public class AnnotationValueAccessTest {
SimpleEntity data = new SimpleEntity();
data.myMappedProperty = "mapped property value";
EdmMapping mapping = mockMapping("MyMappedProperty");
-
+
Object value = ava.getMappingValue(data, mapping);
-
+
Assert.assertEquals(String.class, value.getClass());
Assert.assertEquals("mapped property value", value);
}
@@ -178,9 +174,9 @@ public class AnnotationValueAccessTest {
SimpleEntity data = new SimpleEntity();
data.myMappedProperty = "property";
EdmMapping mapping = null;
-
+
Object value = ava.getMappingValue(data, mapping);
-
+
Assert.assertNull(value);
}
@@ -190,9 +186,9 @@ public class AnnotationValueAccessTest {
SimpleEntity data = new SimpleEntity();
data.myMappedProperty = null;
EdmMapping mapping = mockMapping("MyMappedProperty");
-
+
Object value = ava.getMappingValue(data, mapping);
-
+
Assert.assertNull(value);
}
@@ -202,10 +198,10 @@ public class AnnotationValueAccessTest {
SimpleEntity data = new SimpleEntity();
data.myMappedProperty = "mapped property value";
EdmMapping mapping = mockMapping("MyMappedProperty");
-
+
Object value = "Changed mapped property value";
ava.setMappingValue(data, mapping, value);
-
+
Assert.assertEquals("Changed mapped property value", data.myMappedProperty);
}
@@ -215,10 +211,10 @@ public class AnnotationValueAccessTest {
SimpleEntity data = new SimpleEntity();
data.myMappedProperty = "mapped property value";
EdmMapping mapping = mockMapping("MyMappedProperty");
-
+
Object value = null;
ava.setMappingValue(data, mapping, value);
-
+
Assert.assertNull(data.myMappedProperty);
}
@@ -228,20 +224,20 @@ public class AnnotationValueAccessTest {
SimpleEntity data = new SimpleEntity();
data.myMappedProperty = "mapped property value";
EdmMapping mapping = null;
-
+
Object value = null;
ava.setMappingValue(data, mapping, value);
-
+
Assert.assertEquals("mapped property value", data.myMappedProperty);
}
-
- private EdmProperty mockProperty(String name) throws EdmException {
+
+ private EdmProperty mockProperty(final String name) throws EdmException {
EdmProperty property = Mockito.mock(EdmProperty.class);
Mockito.when(property.getName()).thenReturn(name);
return property;
}
- private EdmMapping mockMapping(String mimeTypeKey) throws EdmException {
+ private EdmMapping mockMapping(final String mimeTypeKey) throws EdmException {
EdmMapping mapping = Mockito.mock(EdmMapping.class);
Mockito.when(mapping.getMediaResourceMimeTypeKey()).thenReturn(mimeTypeKey);
return mapping;
@@ -249,11 +245,11 @@ public class AnnotationValueAccessTest {
@EdmEntityType
private class SimpleEntity {
- @org.apache.olingo.odata2.api.annotation.edm.EdmProperty String name;
- @org.apache.olingo.odata2.api.annotation.edm.EdmProperty String myMappedProperty;
- }
-
- private class NotAnnotatedBean {
- private String name;
+ @org.apache.olingo.odata2.api.annotation.edm.EdmProperty
+ String name;
+ @org.apache.olingo.odata2.api.annotation.edm.EdmProperty
+ String myMappedProperty;
}
+
+ private class NotAnnotatedBean {}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationsInMemoryDsTest.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationsInMemoryDsTest.java b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationsInMemoryDsTest.java
index ddf4ce5..690570a 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationsInMemoryDsTest.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationsInMemoryDsTest.java
@@ -68,8 +68,8 @@ public class AnnotationsInMemoryDsTest {
ANNOTATED_ENTITY_SET_CLASSES.add(Manager.class);
ANNOTATED_ENTITY_SET_CLASSES.add(Photo.class);
ANNOTATED_ENTITY_SET_CLASSES.add(Room.class);
- ANNOTATED_ENTITY_SET_CLASSES.add(Team. class);
-
+ ANNOTATED_ENTITY_SET_CLASSES.add(Team.class);
+
ANNOTATED_MODEL_CLASSES.addAll(ANNOTATED_ENTITY_SET_CLASSES);
ANNOTATED_MODEL_CLASSES.add(Location.class);
ANNOTATED_MODEL_CLASSES.add(City.class);
@@ -84,7 +84,7 @@ public class AnnotationsInMemoryDsTest {
datasource = new AnnotationInMemoryDs(Building.class.getPackage().getName(), false);
edmProvider = new AnnotationEdmProvider(Building.class.getPackage().getName());
}
-
+
@Test
public void initFromPackage() throws Exception {
AnnotationInMemoryDs ds = new AnnotationInMemoryDs(Building.class.getPackage().getName(), false);
@@ -205,7 +205,7 @@ public class AnnotationsInMemoryDsTest {
}
private Thread createBuildingThread(final CountDownLatch latch, final DataSource datasource,
- final EdmEntitySet edmEntitySet, final String id) {
+ final EdmEntitySet edmEntitySet, final String id) {
Runnable run = new Runnable() {
@Override
public void run() {
@@ -447,7 +447,7 @@ public class AnnotationsInMemoryDsTest {
// execute
Object relatedData = datasource.readRelatedData(
- buildingsEntitySet, building, roomsEntitySet, Collections.EMPTY_MAP);
+ buildingsEntitySet, building, roomsEntitySet, Collections.EMPTY_MAP);
// validate
Assert.assertTrue("Result is no collection.", relatedData instanceof Collection);
@@ -482,7 +482,7 @@ public class AnnotationsInMemoryDsTest {
// execute
Object relatedData = datasource.readRelatedData(
- roomsEntitySet, room, buildingsEntitySet, Collections.EMPTY_MAP);
+ roomsEntitySet, room, buildingsEntitySet, Collections.EMPTY_MAP);
// validate
Assert.assertTrue("Result is no room.", relatedData instanceof Building);
@@ -512,7 +512,7 @@ public class AnnotationsInMemoryDsTest {
// execute
Object relatedData = datasource.readRelatedData(
- roomsEntitySet, room, buildingsEntitySet, Collections.EMPTY_MAP);
+ roomsEntitySet, room, buildingsEntitySet, Collections.EMPTY_MAP);
// validate
Assert.assertNull("Related data must be null.", relatedData);
@@ -549,7 +549,7 @@ public class AnnotationsInMemoryDsTest {
Map<String, Object> targetKeys = new HashMap<String, Object>();
targetKeys.put("Id", 3);
Object relatedData = datasource.readRelatedData(
- buildingsEntitySet, building, roomsEntitySet, targetKeys);
+ buildingsEntitySet, building, roomsEntitySet, targetKeys);
// validate
Assert.assertTrue("Result is no Room.", relatedData instanceof Room);
@@ -708,8 +708,7 @@ public class AnnotationsInMemoryDsTest {
try {
Building readAfterDelete = (Building) datasource.readData(edmEntitySet, keys);
Assert.fail("Expected " + ODataNotFoundException.class + "was not thrown for '" + readAfterDelete + "'.");
- } catch (ODataNotFoundException e) {
- }
+ } catch (ODataNotFoundException e) {}
}
@Test(expected = ODataRuntimeException.class)
@@ -757,7 +756,8 @@ public class AnnotationsInMemoryDsTest {
Building created = buildingStore.create(building);
Room room = new Room(42, "Room with Number");
- room.setSeats(123);;
+ room.setSeats(123);
+ ;
room.setVersion(4711);
roomStore.create(room);
@@ -785,8 +785,8 @@ public class AnnotationsInMemoryDsTest {
return createMockedEdmEntitySet(edmProvider, entitySetName);
}
- private EdmEntitySet createMockedEdmEntitySet(AnnotationEdmProvider edmProvider, final String entitySetName)
- throws ODataException {
+ private EdmEntitySet createMockedEdmEntitySet(final AnnotationEdmProvider edmProvider, final String entitySetName)
+ throws ODataException {
EntitySet entitySet = edmProvider.getEntitySet(DEFAULT_CONTAINER, entitySetName);
FullQualifiedName entityType = entitySet.getEntityType();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/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 322116a..9d25e0a 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
@@ -32,11 +32,11 @@ import org.mockito.Mockito;
public class BeanPropertyAccessTest {
private final BeanPropertyAccess ava;
-
+
public BeanPropertyAccessTest() {
ava = new BeanPropertyAccess();
}
-
+
@Test
public void getPropertyType() throws ODataException {
SimpleEntity data = new SimpleEntity();
@@ -44,11 +44,11 @@ public class BeanPropertyAccessTest {
EdmProperty property = mockProperty("Name");
Class<?> type = ava.getPropertyType(data, property);
-
+
Assert.assertEquals(String.class, type);
}
- @Test(expected=ODataNotFoundException.class)
+ @Test(expected = ODataNotFoundException.class)
public void getPropertyTypeInvalidPropertyName() throws ODataException {
SimpleEntity data = new SimpleEntity();
data.name = "A Name";
@@ -60,200 +60,204 @@ public class BeanPropertyAccessTest {
@Test
public void getPropertyValue() throws ODataException {
-
+
SimpleEntity data = new SimpleEntity();
data.name = "A Name";
EdmProperty property = mockProperty("Name");
Object value = ava.getPropertyValue(data, property);
-
+
Assert.assertEquals(String.class, value.getClass());
Assert.assertEquals("A Name", value);
}
@Test
public void getPropertyValueBoolean() throws ODataException {
-
+
SimpleEntity data = new SimpleEntity();
EdmProperty property = mockProperty("BooleanProperty", true);
Object value = ava.getPropertyValue(data, property);
-
+
Assert.assertEquals(Boolean.class, value.getClass());
Assert.assertEquals(true, value);
}
@Test
public void getPropertyValueNull() throws ODataException {
-
+
SimpleEntity data = new SimpleEntity();
EdmProperty property = mockProperty("Name");
Object value = ava.getPropertyValue(data, property);
-
+
Assert.assertNull(value);
}
@Test
public void getPropertyValueNullData() throws ODataException {
-
+
SimpleEntity data = null;
EdmProperty property = mockProperty("Name");
Object value = ava.getPropertyValue(data, property);
-
+
Assert.assertNull(value);
}
@Test
public void setPropertyValue() throws ODataException {
-
+
SimpleEntity data = new SimpleEntity();
data.name = "A Name";
EdmProperty property = mockProperty("Name");
-
+
Object value = "Another Name";
ava.setPropertyValue(data, property, value);
-
+
Assert.assertEquals("Another Name", data.name);
}
@Test
public void setPropertyValueNull() throws ODataException {
-
+
SimpleEntity data = new SimpleEntity();
data.name = "A Name";
EdmProperty property = mockProperty("Name");
-
+
ava.setPropertyValue(data, property, null);
-
+
Assert.assertNull(null, data.name);
}
@Test
public void getMappingValue() throws Exception {
-
+
SimpleEntity data = new SimpleEntity();
data.myMappedProperty = "mapped property value";
EdmMapping mapping = mockMapping("getMyMappedProperty");
-
+
Object value = ava.getMappingValue(data, mapping);
-
+
Assert.assertEquals(String.class, value.getClass());
Assert.assertEquals("mapped property value", value);
}
-
@Test
public void getMappingValueNullMapping() throws Exception {
-
+
SimpleEntity data = new SimpleEntity();
data.myMappedProperty = "property";
EdmMapping mapping = null;
-
+
Object value = ava.getMappingValue(data, mapping);
-
+
Assert.assertNull(value);
}
@Test
public void getMappingValueNullValue() throws Exception {
-
+
SimpleEntity data = new SimpleEntity();
data.myMappedProperty = null;
EdmMapping mapping = mockMapping("getMyMappedProperty");
-
+
Object value = ava.getMappingValue(data, mapping);
-
+
Assert.assertNull(value);
}
@Test
public void setMappingValue() throws Exception {
-
+
SimpleEntity data = new SimpleEntity();
data.myMappedProperty = "mapped property value";
EdmMapping mapping = mockMapping("getMyMappedProperty");
-
+
Object value = "Changed mapped property value";
ava.setMappingValue(data, mapping, value);
-
+
Assert.assertEquals("Changed mapped property value", data.myMappedProperty);
}
@Test
public void setMappingValueNullValue() throws Exception {
-
+
SimpleEntity data = new SimpleEntity();
data.myMappedProperty = "mapped property value";
EdmMapping mapping = mockMapping("getMyMappedProperty");
-
+
Object value = null;
ava.setMappingValue(data, mapping, value);
-
+
Assert.assertNull(data.myMappedProperty);
}
@Test
public void setMappingValueNullMapping() throws Exception {
-
+
SimpleEntity data = new SimpleEntity();
data.myMappedProperty = "mapped property value";
EdmMapping mapping = null;
-
+
Object value = null;
ava.setMappingValue(data, mapping, value);
-
+
Assert.assertEquals("mapped property value", data.myMappedProperty);
}
- @Test(expected=ODataNotFoundException.class)
+ @Test(expected = ODataNotFoundException.class)
public void invalidMethodName() throws Exception {
-
+
SimpleEntity data = new SimpleEntity();
data.myMappedProperty = null;
EdmMapping mapping = mockMapping("MyMappedProperty");
-
+
Object value = ava.getMappingValue(data, mapping);
-
+
Assert.assertNull(value);
}
- private EdmProperty mockProperty(String name) throws EdmException {
+ private EdmProperty mockProperty(final String name) throws EdmException {
return mockProperty(name, false);
}
-
- private EdmProperty mockProperty(String name, boolean isBoolean) throws EdmException {
+
+ private EdmProperty mockProperty(final String name, final boolean isBoolean) throws EdmException {
EdmProperty property = Mockito.mock(EdmProperty.class);
Mockito.when(property.getName()).thenReturn(name);
Mockito.when(property.isSimple()).thenReturn(Boolean.TRUE);
- if(isBoolean) {
+ if (isBoolean) {
Mockito.when(property.getType()).thenReturn(EdmSimpleTypeKind.Boolean.getEdmSimpleTypeInstance());
}
return property;
}
- private EdmMapping mockMapping(String mimeTypeKey) throws EdmException {
+ private EdmMapping mockMapping(final String mimeTypeKey) throws EdmException {
EdmMapping mapping = Mockito.mock(EdmMapping.class);
Mockito.when(mapping.getMimeType()).thenReturn(mimeTypeKey);
return mapping;
}
- private class SimpleEntity {
+ protected class SimpleEntity {
private String name;
private String myMappedProperty;
+
public final String getName() {
return name;
}
- public final void setName(String name) {
+
+ public final void setName(final String name) {
this.name = name;
}
+
public final String getMyMappedProperty() {
return myMappedProperty;
}
- public final void setMyMappedProperty(String myMappedProperty) {
+
+ public final void setMyMappedProperty(final String myMappedProperty) {
this.myMappedProperty = myMappedProperty;
}
+
public final boolean isBooleanProperty() {
return true;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/model/Building.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/model/Building.java b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/model/Building.java
index bc9f54b..350ef16 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/model/Building.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/model/Building.java
@@ -53,7 +53,7 @@ public class Building {
return id;
}
- public void setId(String id) {
+ public void setId(final String id) {
this.id = id;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/model/Room.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/model/Room.java b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/model/Room.java
index 57e42db..c808cbd 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/model/Room.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/model/Room.java
@@ -42,7 +42,7 @@ public class Room extends RefBase {
public Room() {
this(0, null);
}
-
+
public Room(final int id, final String name) {
super(id, name);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/util/AnnotationHelperTest.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/util/AnnotationHelperTest.java b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/util/AnnotationHelperTest.java
index 2e95f82..7bd35ad 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/util/AnnotationHelperTest.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/util/AnnotationHelperTest.java
@@ -196,7 +196,7 @@ public class AnnotationHelperTest {
public void setValueForPropertyNullInstance() throws Exception {
annotationHelper.setValueForProperty(null, "", null);
}
-
+
@Test
public void extractEntitySetNameObject() {
Assert.assertNull(annotationHelper.extractEntitySetName(Object.class));
@@ -213,7 +213,7 @@ public class AnnotationHelperTest {
Assert.assertEquals("RefScenario", fqn.getNamespace());
Assert.assertEquals("c_Location", fqn.getName());
}
-
+
@Test
public void convert() throws Exception {
ConversionProperty cp = new ConversionProperty();
@@ -223,7 +223,7 @@ public class AnnotationHelperTest {
annotationHelper.setValueForProperty(cp, "FloatProp", "43");
annotationHelper.setValueForProperty(cp, "DoubleProp", "42.00");
annotationHelper.setValueForProperty(cp, "ByteProp", "1");
-
+
Assert.assertEquals("42", cp.stringProp);
Assert.assertEquals(Integer.valueOf(420), cp.integerProp);
Assert.assertEquals(Long.valueOf("4200"), cp.longProp);
@@ -242,7 +242,7 @@ public class AnnotationHelperTest {
public SimpleEntity() {}
- public SimpleEntity(Long id, String name) {
+ public SimpleEntity(final Long id, final String name) {
this.id = id;
this.name = name;
}
@@ -256,15 +256,19 @@ public class AnnotationHelperTest {
}
private class ConversionProperty {
- @EdmProperty(type=EdmType.STRING) String stringProp;
- @EdmProperty(type=EdmType.INT32) Integer integerProp;
- @EdmProperty(type=EdmType.INT64) Long longProp;
- @EdmProperty(type=EdmType.DECIMAL) Float floatProp;
- @EdmProperty(type=EdmType.DOUBLE) Double doubleProp;
- @EdmProperty(type=EdmType.BYTE) Byte byteProp;
- }
-
- private class NotAnnotatedBean {
- private String name;
+ @EdmProperty(type = EdmType.STRING)
+ String stringProp;
+ @EdmProperty(type = EdmType.INT32)
+ Integer integerProp;
+ @EdmProperty(type = EdmType.INT64)
+ Long longProp;
+ @EdmProperty(type = EdmType.DECIMAL)
+ Float floatProp;
+ @EdmProperty(type = EdmType.DOUBLE)
+ Double doubleProp;
+ @EdmProperty(type = EdmType.BYTE)
+ Byte byteProp;
}
+
+ private class NotAnnotatedBean {}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/util/ClassHelperTest.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/util/ClassHelperTest.java b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/util/ClassHelperTest.java
index 0e7c406..c3cd885 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/util/ClassHelperTest.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/util/ClassHelperTest.java
@@ -34,7 +34,7 @@ public class ClassHelperTest {
private final ClassValidator annotatedTestEntityInnerClasses = new ClassValidator() {
@Override
- public boolean isClassValid(Class<?> c) {
+ public boolean isClassValid(final Class<?> c) {
return c.isAnnotationPresent(EdmEntityType.class)
&& c.getName().contains(ClassHelperTest.class.getSimpleName());
}
@@ -42,7 +42,7 @@ public class ClassHelperTest {
private final ClassValidator annotatedEntityClasses = new ClassValidator() {
@Override
- public boolean isClassValid(Class<?> c) {
+ public boolean isClassValid(final Class<?> c) {
return c.isAnnotationPresent(EdmEntityType.class);
}
};
@@ -58,7 +58,7 @@ public class ClassHelperTest {
Assert.assertEquals(1, loadedClasses.size());
Assert.assertEquals(SimpleEntity.class.getName(), loadedClasses.get(0).getName());
}
-
+
@Test
public void loadSingleEntityFromJar() throws ODataException {
String packageToScan = AnnotatedEntity.class.getPackage().getName();
@@ -71,7 +71,6 @@ public class ClassHelperTest {
Assert.assertEquals(AnnotatedEntity.class.getName(), loadedClasses.get(0).getName());
}
-
//
// The below classes are 'unused' within the code but must be declared for loading via
// the 'ClassHelper'
@@ -88,7 +87,7 @@ public class ClassHelperTest {
public SimpleEntity() {}
- public SimpleEntity(Long id, String name) {
+ public SimpleEntity(final Long id, final String name) {
this.id = id;
this.name = name;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-annotation-processor/annotation-processor-ref/src/main/java/org/apache/olingo/odata2/annotation/processor/ref/AnnotationRefServiceFactory.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-ref/src/main/java/org/apache/olingo/odata2/annotation/processor/ref/AnnotationRefServiceFactory.java b/odata2-annotation-processor/annotation-processor-ref/src/main/java/org/apache/olingo/odata2/annotation/processor/ref/AnnotationRefServiceFactory.java
index ccaca81..5a3766f 100644
--- a/odata2-annotation-processor/annotation-processor-ref/src/main/java/org/apache/olingo/odata2/annotation/processor/ref/AnnotationRefServiceFactory.java
+++ b/odata2-annotation-processor/annotation-processor-ref/src/main/java/org/apache/olingo/odata2/annotation/processor/ref/AnnotationRefServiceFactory.java
@@ -56,7 +56,7 @@ public class AnnotationRefServiceFactory extends ODataServiceFactory {
final static String MODEL_PACKAGE = "org.apache.olingo.odata2.annotation.processor.ref.model";
final static ODataService ANNOTATION_ODATA_SERVICE;
-
+
static {
try {
ANNOTATION_ODATA_SERVICE = AnnotationServiceFactory.createAnnotationService(MODEL_PACKAGE);
@@ -116,10 +116,10 @@ public class AnnotationRefServiceFactory extends ODataServiceFactory {
}
- private static <T> DataStore<T> getDataStore(Class<T> clz) throws DataStoreException {
+ private static <T> DataStore<T> getDataStore(final Class<T> clz) throws DataStoreException {
return DataStore.createInMemory(clz, true);
}
-
+
private static void initializeSampleData() throws ODataApplicationException {
DataStore<Team> teamDs = getDataStore(Team.class);
teamDs.create(createTeam("Team Alpha", true));
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/ServiceJsonTest.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/ServiceJsonTest.java b/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/ServiceJsonTest.java
index 4813690..66d3ff2 100644
--- a/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/ServiceJsonTest.java
+++ b/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/ServiceJsonTest.java
@@ -53,11 +53,11 @@ public class ServiceJsonTest extends AbstractRefTest {
Assert.assertTrue(jsonDataResponseContains(body, "Teams"));
}
- private boolean jsonDataResponseContains(String content, String containingValue) {
+ private boolean jsonDataResponseContains(final String content, final String containingValue) {
return content.matches("\\{\"d\":\\{\"EntitySets\":\\[.*"
+ containingValue + ".*\"\\]\\}\\}");
}
-
+
@Test
public void serviceDocumentAcceptHeaderJson() throws Exception {
final HttpResponse response = callUri("", HttpHeaders.ACCEPT, HttpContentType.APPLICATION_JSON);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/ServiceXmlTest.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/ServiceXmlTest.java b/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/ServiceXmlTest.java
index 4d49883..a864c6a 100644
--- a/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/ServiceXmlTest.java
+++ b/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/ServiceXmlTest.java
@@ -41,7 +41,7 @@ public class ServiceXmlTest extends AbstractRefXmlTest {
final HttpResponse response = callUri("/");
checkMediaType(response, HttpContentType.APPLICATION_ATOM_SVC_UTF8);
final String body = getBody(response);
-
+
assertXpathEvaluatesTo("Employees", "/app:service/app:workspace/app:collection[@href=\"Employees\"]", body);
assertXpathEvaluatesTo("Teams", "/app:service/app:workspace/app:collection[@href=\"Teams\"]", body);
assertXpathEvaluatesTo("Rooms", "/app:service/app:workspace/app:collection[@href=\"Rooms\"]", body);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntity.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntity.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntity.java
index 36848c8..c7852d2 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntity.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntity.java
@@ -73,12 +73,12 @@ public class JPAEntity {
this.accessModifiersWrite = accessModifiersWrite;
}
- public void setParentJPAEntity(JPAEntity jpaEntity) {
- this.parentJPAEntity = jpaEntity;
+ public void setParentJPAEntity(final JPAEntity jpaEntity) {
+ parentJPAEntity = jpaEntity;
}
public JPAEntity getParentJPAEntity() {
- return this.parentJPAEntity;
+ return parentJPAEntity;
}
public Object getJPAEntity() {
@@ -202,7 +202,7 @@ public class JPAEntity {
EdmNavigationProperty navProperty =
(EdmNavigationProperty) oDataEntityType.getProperty(navigationPropertyName);
if (relatedJPAEntityMap != null && relatedJPAEntityMap.containsKey(navigationPropertyName)) {
- JPALink.linkJPAEntities(relatedJPAEntityMap.get(navigationPropertyName), this.jpaEntity,
+ JPALink.linkJPAEntities(relatedJPAEntityMap.get(navigationPropertyName), jpaEntity,
navProperty);
} else if (parentJPAEntity != null
&&
@@ -210,7 +210,7 @@ public class JPAEntity {
oDataEntitySet.getRelatedEntitySet(navProperty).getName())) {
List<Object> targetJPAEntities = new ArrayList<Object>();
targetJPAEntities.add(parentJPAEntity.getJPAEntity());
- JPALink.linkJPAEntities(targetJPAEntities, this.jpaEntity, navProperty);
+ JPALink.linkJPAEntities(targetJPAEntities, jpaEntity, navProperty);
} else {
leftNavPrpNames.add(navigationPropertyName);
}
@@ -218,7 +218,7 @@ public class JPAEntity {
}
if (!leftNavPrpNames.isEmpty()) {
JPALink link = new JPALink(oDataJPAContext);
- link.setSourceJPAEntity(this.jpaEntity);
+ link.setSourceJPAEntity(jpaEntity);
link.create(oDataEntitySet, oDataEntry, leftNavPrpNames);
}
} catch (EdmException e) {
@@ -252,7 +252,7 @@ public class JPAEntity {
}
write(oDataEntryProperties, false);
JPALink link = new JPALink(oDataJPAContext);
- link.setSourceJPAEntity(this.jpaEntity);
+ link.setSourceJPAEntity(jpaEntity);
try {
link.create(oDataEntitySet, oDataEntry, oDataEntityType.getNavigationPropertyNames());
} catch (EdmException e) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParser.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParser.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParser.java
index f0ff44f..7fd2e8f 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParser.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParser.java
@@ -67,7 +67,8 @@ public final class JPAEntityParser {
return jpaEmbeddableKeyMap.get(jpaEntityName);
}
- public List<Map<String, Object>> parse2EdmEntityList(Collection<Object> jpaEntityList, List<EdmProperty> properties)
+ public List<Map<String, Object>> parse2EdmEntityList(final Collection<Object> jpaEntityList,
+ final List<EdmProperty> properties)
throws ODataJPARuntimeException {
if (jpaEntityList == null) {
@@ -261,7 +262,8 @@ public final class JPAEntityParser {
return propertyValue;
}
- public Object getEmbeddablePropertyValue(final String methodName, Object jpaEntity) throws ODataJPARuntimeException {
+ public Object getEmbeddablePropertyValue(final String methodName, final Object jpaEntity)
+ throws ODataJPARuntimeException {
String[] nameParts = methodName.split("\\.");
Object propertyValue = jpaEntity;
@@ -391,8 +393,9 @@ public final class JPAEntityParser {
}
}
- private HashMap<String, Method> getAccessModifiers(List<EdmProperty> edmProperties, Class<?> jpaEntityType,
- String accessModifier) throws ODataJPARuntimeException {
+ private HashMap<String, Method> getAccessModifiers(final List<EdmProperty> edmProperties,
+ final Class<?> jpaEntityType,
+ final String accessModifier) throws ODataJPARuntimeException {
HashMap<String, Method> accessModifierMap = jpaEntityAccessMap.get(jpaEntityType.getName());
if (accessModifierMap == null) {
@@ -462,7 +465,7 @@ public final class JPAEntityParser {
return accessModifierMap;
}
- private List<EdmProperty> getEdmProperties(EdmStructuralType structuralType) throws ODataJPARuntimeException {
+ private List<EdmProperty> getEdmProperties(final EdmStructuralType structuralType) throws ODataJPARuntimeException {
List<EdmProperty> edmProperties = new ArrayList<EdmProperty>();
try {
for (String propertyName : structuralType.getPropertyNames()) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAExpandCallBack.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAExpandCallBack.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAExpandCallBack.java
index 4bfa743..1ea8914 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAExpandCallBack.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAExpandCallBack.java
@@ -99,7 +99,7 @@ public class JPAExpandCallBack implements OnWriteFeedContent, OnWriteEntryConten
return result;
}
- private List<EdmProperty> getEdmProperties(EdmEntitySet entitySet, ExpandSelectTreeNode expandTreeNode)
+ private List<EdmProperty> getEdmProperties(final EdmEntitySet entitySet, final ExpandSelectTreeNode expandTreeNode)
throws ODataApplicationException {
try {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPALink.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPALink.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPALink.java
index 437c057..6e85366 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPALink.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPALink.java
@@ -193,7 +193,7 @@ public class JPALink {
}
public void create(final EdmEntitySet entitySet, final ODataEntry oDataEntry,
- List<String> navigationPropertyNames)
+ final List<String> navigationPropertyNames)
throws ODataJPARuntimeException,
ODataJPAModelException {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/data/EdmMockUtil.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/data/EdmMockUtil.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/data/EdmMockUtil.java
index 632a299..cda54df 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/data/EdmMockUtil.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/data/EdmMockUtil.java
@@ -297,7 +297,7 @@ public class EdmMockUtil {
EdmProperty property = mockEdmPropertyOfTarget();
EasyMock.expect(entityType.getProperty("price")).andStubReturn(property);
EasyMock.expect(entityType.getPropertyNames()).andStubReturn(propertyNames);
-
+
List<EdmProperty> keyProperties = new ArrayList<EdmProperty>();
keyProperties.add(property);
EasyMock.expect(entityType.getKeyProperties()).andStubReturn(keyProperties);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/data/ODataEntryMockUtil.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/data/ODataEntryMockUtil.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/data/ODataEntryMockUtil.java
index 125f160..27ac4ea 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/data/ODataEntryMockUtil.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/data/ODataEntryMockUtil.java
@@ -130,7 +130,7 @@ public class ODataEntryMockUtil {
}
private static void
- enhanceMockODataEntry(final ODataEntry oDataEntry, boolean hasInline, List<String> associationURIs) {
+ enhanceMockODataEntry(final ODataEntry oDataEntry, final boolean hasInline, final List<String> associationURIs) {
EasyMock.expect(oDataEntry.containsInlineEntry()).andReturn(hasInline).anyTimes();
EntryMetadata entryMetadata = EasyMock.createMock(EntryMetadata.class);
if (hasInline) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SalesOrderItem.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SalesOrderItem.java b/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SalesOrderItem.java
index a8671d1..412287b 100644
--- a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SalesOrderItem.java
+++ b/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SalesOrderItem.java
@@ -64,7 +64,7 @@ public class SalesOrderItem {
}
public void setDelivered(final Boolean deliveryStatus) {
- this.delivered = deliveryStatus;
+ delivered = deliveryStatus;
}
@JoinColumn(name = "Material_Id", referencedColumnName = "MATERIAL_ID")
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/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 32f196f..38cdd8c 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
@@ -129,7 +129,7 @@ public class ListsProcessor extends ODataSingleProcessor {
public ListsProcessor(final ScenarioDataSource dataSource) {
this(dataSource, new BeanPropertyAccess());
}
-
+
public ListsProcessor(final ScenarioDataSource dataSource, final BeanPropertyAccess valueAccess) {
this.dataSource = dataSource;
this.valueAccess = valueAccess;
@@ -212,16 +212,16 @@ public class ListsProcessor extends ODataSingleProcessor {
return ODataResponse.fromResponse(response).build();
}
- String percentEncodeNextLink(String link) {
- if(link == null) {
+ String percentEncodeNextLink(final String link) {
+ if (link == null) {
return null;
}
-
+
return link.replaceAll("\\$skiptoken=.+?(?:&|$)", "")
.replaceAll("\\$skip=.+?(?:&|$)", "")
.replaceFirst("(?:\\?|&)$", ""); // Remove potentially trailing "?" or "&" left over from remove actions
}
-
+
@Override
public ODataResponse countEntitySet(final GetEntitySetCountUriInfo uriInfo, final String contentType)
throws ODataException {
@@ -913,7 +913,7 @@ public class ListsProcessor extends ODataSingleProcessor {
keys.isEmpty() ?
dataSource.readData(startEntitySet) : dataSource.readData(startEntitySet, keys) :
dataSource.readData(functionImport, functionImportParameters, keys);
-
+
EdmEntitySet currentEntitySet =
functionImport == null ? startEntitySet : functionImport.getEntitySet();
for (NavigationSegment navigationSegment : navigationSegments) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-lib/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ScenarioDataSource.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ScenarioDataSource.java b/odata2-lib/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ScenarioDataSource.java
index cb055ed..d2f55aa 100644
--- a/odata2-lib/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ScenarioDataSource.java
+++ b/odata2-lib/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ScenarioDataSource.java
@@ -605,7 +605,7 @@ public class ScenarioDataSource {
throw new ODataNotImplementedException();
}
}
-
+
/**
* Container to store binary data (as byte array) and the associated MIME type.
*/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-lib/odata-ref/src/test/java/org/apache/olingo/odata2/ref/processor/ListsProcessorTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-ref/src/test/java/org/apache/olingo/odata2/ref/processor/ListsProcessorTest.java b/odata2-lib/odata-ref/src/test/java/org/apache/olingo/odata2/ref/processor/ListsProcessorTest.java
index bfca445..b695a55 100644
--- a/odata2-lib/odata-ref/src/test/java/org/apache/olingo/odata2/ref/processor/ListsProcessorTest.java
+++ b/odata2-lib/odata-ref/src/test/java/org/apache/olingo/odata2/ref/processor/ListsProcessorTest.java
@@ -26,9 +26,9 @@ import org.junit.Test;
*
*/
public class ListsProcessorTest {
-
+
private ListsProcessor listsProcessor;
-
+
public ListsProcessorTest() {
listsProcessor = new ListsProcessor(null);
}
@@ -68,7 +68,7 @@ public class ListsProcessorTest {
String url = "Rooms?$orderby=Seats%20desc&$skiptoken=213&$top=200";
String result = listsProcessor.percentEncodeNextLink(url);
Assert.assertEquals("Rooms?$orderby=Seats%20desc&$top=200", result);
-
+
String url2 = "Rooms?$orderby=Seats%20desc&$skiptoken=213";
String result2 = listsProcessor.percentEncodeNextLink(url2);
Assert.assertEquals("Rooms?$orderby=Seats%20desc", result2);
[03/14] git commit: [OLINGO-128] Fix OData Response in case of deep
insert. No Inline entries are added to the OData Response.
Posted by sk...@apache.org. [OLINGO-128] Fix OData Response in case of deep insert. No Inline
entries are added to the OData Response.
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/commit/53984daf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/53984daf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/53984daf
Branch: refs/heads/olingo-117
Commit: 53984daf297c6ad531d22152394385f93aefb8d8
Parents: f6591e3
Author: Chandan V A <ch...@sap.com>
Authored: Sat Jan 18 15:50:01 2014 +0530
Committer: Chandan V A <ch...@sap.com>
Committed: Sat Jan 18 15:50:01 2014 +0530
----------------------------------------------------------------------
.../processor/api/ODataJPAResponseBuilder.java | 6 +--
.../jpa/processor/api/access/JPAProcessor.java | 8 +--
.../core/ODataJPAProcessorDefault.java | 4 +-
.../core/ODataJPAResponseBuilderDefault.java | 51 ++------------------
.../processor/core/access/data/JPAEntity.java | 10 ----
.../core/access/data/JPAProcessorImpl.java | 16 +++---
6 files changed, 20 insertions(+), 75 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/53984daf/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/ODataJPAResponseBuilder.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/ODataJPAResponseBuilder.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/ODataJPAResponseBuilder.java
index 63d692b..cc9bffc 100644
--- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/ODataJPAResponseBuilder.java
+++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/ODataJPAResponseBuilder.java
@@ -63,15 +63,15 @@ public interface ODataJPAResponseBuilder {
ODataNotFoundException;
/**
- * The method builds an OData response for an OData Create Request from a created List of JPA entities.
+ * The method builds an OData response for an OData Create Request from a created JPA entity.
* @param postUriInfo is an information about the request URI
- * @param createdObjectList is an empty or non empty list of created instances of JPA Entities
+ * @param createdObject is a null or non null instances of JPA Entity
* @param contentType of the response
* @return an instance of type {@link org.apache.olingo.odata2.api.processor.ODataResponse}
* @throws ODataJPARuntimeException
* @throws ODataNotFoundException
*/
- public ODataResponse build(final PostUriInfo postUriInfo, final List<Object> createdObjectList,
+ public ODataResponse build(final PostUriInfo postUriInfo, final Object createdObject,
final String contentType) throws ODataJPARuntimeException,
ODataNotFoundException;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/53984daf/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/access/JPAProcessor.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/access/JPAProcessor.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/access/JPAProcessor.java
index 4b063cc..e045a72 100644
--- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/access/JPAProcessor.java
+++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/access/JPAProcessor.java
@@ -160,7 +160,7 @@ public interface JPAProcessor {
* @throws ODataJPARuntimeException
*/
- public <T> List<T> process(PostUriInfo createView, InputStream content,
+ public Object process(PostUriInfo createView, InputStream content,
String requestContentType) throws ODataJPAModelException,
ODataJPARuntimeException;
@@ -177,7 +177,7 @@ public interface JPAProcessor {
* @throws ODataJPARuntimeException
*/
- public <T> List<T> process(PostUriInfo createView, Map<String, Object> content) throws ODataJPAModelException,
+ public Object process(PostUriInfo createView, Map<String, Object> content) throws ODataJPAModelException,
ODataJPARuntimeException;
/**
@@ -192,7 +192,7 @@ public interface JPAProcessor {
* @throws ODataJPAModelException
* @throws ODataJPARuntimeException
*/
- public <T> Object process(PutMergePatchUriInfo updateView,
+ public Object process(PutMergePatchUriInfo updateView,
InputStream content, String requestContentType)
throws ODataJPAModelException, ODataJPARuntimeException;
@@ -207,7 +207,7 @@ public interface JPAProcessor {
* @throws ODataJPAModelException
* @throws ODataJPARuntimeException
*/
- public <T> Object process(PutMergePatchUriInfo updateView, Map<String, Object> content)
+ public Object process(PutMergePatchUriInfo updateView, Map<String, Object> content)
throws ODataJPAModelException, ODataJPARuntimeException;
/**
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/53984daf/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPAProcessorDefault.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPAProcessorDefault.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPAProcessorDefault.java
index f59edf9..2ecabd1 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPAProcessorDefault.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPAProcessorDefault.java
@@ -96,10 +96,10 @@ public class ODataJPAProcessorDefault extends ODataJPAProcessor {
public ODataResponse createEntity(final PostUriInfo uriParserResultView, final InputStream content,
final String requestContentType, final String contentType) throws ODataException {
- List<Object> createdJpaEntityList = jpaProcessor.process(uriParserResultView, content, requestContentType);
+ Object createdJpaEntity = jpaProcessor.process(uriParserResultView, content, requestContentType);
ODataResponse oDataResponse =
- responseBuilder.build(uriParserResultView, createdJpaEntityList, contentType);
+ responseBuilder.build(uriParserResultView, createdJpaEntity, contentType);
return oDataResponse;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/53984daf/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPAResponseBuilderDefault.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPAResponseBuilderDefault.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPAResponseBuilderDefault.java
index c11713c..2a5e446 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPAResponseBuilderDefault.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPAResponseBuilderDefault.java
@@ -194,13 +194,12 @@ public final class ODataJPAResponseBuilderDefault implements ODataJPAResponseBui
}
/* Response for Create Entity */
- @SuppressWarnings("unchecked")
@Override
- public ODataResponse build(final PostUriInfo uriInfo, final List<Object> createdObjectList,
+ public ODataResponse build(final PostUriInfo uriInfo, final Object createdObject,
final String contentType) throws ODataJPARuntimeException,
ODataNotFoundException {
- if (createdObjectList == null || createdObjectList.size() == 0 || createdObjectList.get(0) == null) {
+ if (createdObject == null) {
throw new ODataNotFoundException(ODataNotFoundException.ENTITY);
}
@@ -213,20 +212,11 @@ public final class ODataJPAResponseBuilderDefault implements ODataJPAResponseBui
Map<String, Object> edmPropertyValueMap = null;
JPAEntityParser jpaResultParser = new JPAEntityParser();
- edmPropertyValueMap = jpaResultParser.parse2EdmPropertyValueMap(createdObjectList.get(0), edmEntityType);
+ edmPropertyValueMap = jpaResultParser.parse2EdmPropertyValueMap(createdObject, edmEntityType);
- List<ArrayList<NavigationPropertySegment>> expandList = null;
- if (createdObjectList.get(1) != null
- && ((Map<EdmNavigationProperty, EdmEntitySet>) createdObjectList.get(1)).size() > 0) {
- expandList = getExpandList((Map<EdmNavigationProperty, EdmEntitySet>) createdObjectList.get(1));
- HashMap<String, Object> navigationMap =
- jpaResultParser.parse2EdmNavigationValueMap(createdObjectList.get(0),
- constructListofNavProperty(expandList));
- edmPropertyValueMap.putAll(navigationMap);
- }
EntityProviderWriteProperties feedProperties = null;
try {
- feedProperties = getEntityProviderPropertiesforPost(oDataJPAContext, uriInfo, expandList);
+ feedProperties = getEntityProviderPropertiesforPost(oDataJPAContext, uriInfo);
} catch (ODataException e) {
throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e);
}
@@ -564,17 +554,11 @@ public final class ODataJPAResponseBuilderDefault implements ODataJPAResponseBui
}
private static EntityProviderWriteProperties getEntityProviderPropertiesforPost(
- final ODataJPAContext odataJPAContext, final PostUriInfo resultsView,
- final List<ArrayList<NavigationPropertySegment>> expandList) throws ODataJPARuntimeException {
+ final ODataJPAContext odataJPAContext, final PostUriInfo resultsView) throws ODataJPARuntimeException {
ODataEntityProviderPropertiesBuilder entityFeedPropertiesBuilder = null;
- ExpandSelectTreeNode expandSelectTree = null;
try {
entityFeedPropertiesBuilder =
EntityProviderWriteProperties.serviceRoot(odataJPAContext.getODataContext().getPathInfo().getServiceRoot());
- expandSelectTree = UriParser.createExpandSelectTree(null, expandList);
- entityFeedPropertiesBuilder.expandSelectTree(expandSelectTree);
- entityFeedPropertiesBuilder.callbacks(JPAExpandCallBack.getCallbacks(odataJPAContext.getODataContext()
- .getPathInfo().getServiceRoot(), expandSelectTree, expandList));
} catch (ODataException e) {
throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e);
}
@@ -582,31 +566,6 @@ public final class ODataJPAResponseBuilderDefault implements ODataJPAResponseBui
return entityFeedPropertiesBuilder.build();
}
- private static List<ArrayList<NavigationPropertySegment>> getExpandList(
- final Map<EdmNavigationProperty, EdmEntitySet> navPropEntitySetMap) {
- List<ArrayList<NavigationPropertySegment>> expandList = new ArrayList<ArrayList<NavigationPropertySegment>>();
- ArrayList<NavigationPropertySegment> navigationPropertySegmentList = new ArrayList<NavigationPropertySegment>();
- for (Map.Entry<EdmNavigationProperty, EdmEntitySet> entry : navPropEntitySetMap.entrySet()) {
- final EdmNavigationProperty edmNavigationProperty = entry.getKey();
- final EdmEntitySet edmEntitySet = entry.getValue();
- NavigationPropertySegment navigationPropertySegment = new NavigationPropertySegment() {
-
- @Override
- public EdmEntitySet getTargetEntitySet() {
- return edmEntitySet;
- }
-
- @Override
- public EdmNavigationProperty getNavigationProperty() {
- return edmNavigationProperty;
- }
- };
- navigationPropertySegmentList.add(navigationPropertySegment);
- }
- expandList.add(navigationPropertySegmentList);
- return expandList;
- }
-
private static List<EdmProperty> buildSelectItemList(final List<SelectItem> selectItems, final EdmEntityType entity)
throws ODataJPARuntimeException {
boolean flag = false;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/53984daf/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntity.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntity.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntity.java
index d7d4446..36848c8 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntity.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntity.java
@@ -53,7 +53,6 @@ public class JPAEntity {
private HashMap<String, Method> accessModifiersWrite = null;
private JPAEntityParser jpaEntityParser = null;
private ODataJPAContext oDataJPAContext;
- public HashMap<EdmNavigationProperty, EdmEntitySet> inlinedEntities = null;
public HashMap<String, List<Object>> relatedJPAEntityMap = null;
public JPAEntity(final EdmEntityType oDataEntityType, final EdmEntitySet oDataEntitySet,
@@ -157,10 +156,6 @@ public class JPAEntity {
EdmNavigationProperty navProperty = (EdmNavigationProperty) edmTyped;
EdmEntitySet edmRelatedEntitySet = oDataEntitySet.getRelatedEntitySet(navProperty);
List<ODataEntry> relatedEntries = (List<ODataEntry>) oDataEntryProperties.get(propertyName);
- if (inlinedEntities == null) {
- inlinedEntities = new HashMap<EdmNavigationProperty, EdmEntitySet>();
- }
-
if (relatedJPAEntityMap == null) {
relatedJPAEntityMap = new HashMap<String, List<Object>>();
}
@@ -173,7 +168,6 @@ public class JPAEntity {
relatedJPAEntities.add(relatedEntity.getJPAEntity());
}
relatedJPAEntityMap.put(navProperty.getName(), relatedJPAEntities);
- inlinedEntities.put((EdmNavigationProperty) edmTyped, edmRelatedEntitySet);
}
default:
continue;
@@ -277,10 +271,6 @@ public class JPAEntity {
write(oDataEntryProperties, false);
}
- public HashMap<EdmNavigationProperty, EdmEntitySet> getInlineJPAEntities() {
- return inlinedEntities;
- }
-
public void setJPAEntity(final Object jpaEntity) {
this.jpaEntity = jpaEntity;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/53984daf/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAProcessorImpl.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAProcessorImpl.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAProcessorImpl.java
index 0b46fd9..219f5b7 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAProcessorImpl.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAProcessorImpl.java
@@ -270,34 +270,33 @@ public class JPAProcessorImpl implements JPAProcessor {
/* Process Create Entity Request */
@Override
- public <T> List<T> process(final PostUriInfo createView, final InputStream content,
+ public Object process(final PostUriInfo createView, final InputStream content,
final String requestedContentType) throws ODataJPAModelException,
ODataJPARuntimeException {
return processCreate(createView, content, null, requestedContentType);
}
@Override
- public <T> List<T> process(final PostUriInfo createView, final Map<String, Object> content)
+ public Object process(final PostUriInfo createView, final Map<String, Object> content)
throws ODataJPAModelException, ODataJPARuntimeException {
return processCreate(createView, null, content, null);
}
/* Process Update Entity Request */
@Override
- public <T> Object process(final PutMergePatchUriInfo updateView,
+ public Object process(final PutMergePatchUriInfo updateView,
final InputStream content, final String requestContentType)
throws ODataJPAModelException, ODataJPARuntimeException {
return processUpdate(updateView, content, null, requestContentType);
}
@Override
- public <T> Object process(final PutMergePatchUriInfo updateView, final Map<String, Object> content)
+ public Object process(final PutMergePatchUriInfo updateView, final Map<String, Object> content)
throws ODataJPAModelException, ODataJPARuntimeException {
return processUpdate(updateView, null, content, null);
}
- @SuppressWarnings("unchecked")
- private <T> List<T> processCreate(final PostUriInfo createView, final InputStream content,
+ private Object processCreate(final PostUriInfo createView, final InputStream content,
final Map<String, Object> properties,
final String requestedContentType) throws ODataJPAModelException,
ODataJPARuntimeException {
@@ -306,7 +305,6 @@ public class JPAProcessorImpl implements JPAProcessor {
final EdmEntitySet oDataEntitySet = createView.getTargetEntitySet();
final EdmEntityType oDataEntityType = oDataEntitySet.getEntityType();
final JPAEntity virtualJPAEntity = new JPAEntity(oDataEntityType, oDataEntitySet, oDataJPAContext);
- final List<Object> createList = new ArrayList<Object>();
Object jpaEntity = null;
if (content != null) {
@@ -327,10 +325,8 @@ public class JPAProcessorImpl implements JPAProcessor {
if (em.contains(jpaEntity)) {
em.getTransaction().commit();
- createList.add(virtualJPAEntity.getJPAEntity());
- createList.add(virtualJPAEntity.getInlineJPAEntities());
+ return jpaEntity;
- return (List<T>) createList;
}
} catch (Exception e) {
throw ODataJPARuntimeException.throwException(
[10/14] git commit: [OLINGO-71] Reset release candidate version
Posted by sk...@apache.org. [OLINGO-71] Reset release candidate version
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/commit/b0ebd532
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/b0ebd532
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/b0ebd532
Branch: refs/heads/olingo-117
Commit: b0ebd5326385c925e2dd9d18e63c831107e008e1
Parents: 8e82c15
Author: Christian Amend <ch...@apache.org>
Authored: Wed Jan 22 10:42:23 2014 +0100
Committer: Christian Amend <ch...@apache.org>
Committed: Wed Jan 22 10:47:07 2014 +0100
----------------------------------------------------------------------
odata2-annotation-processor/annotation-processor-api/pom.xml | 2 +-
odata2-annotation-processor/annotation-processor-core/pom.xml | 2 +-
odata2-annotation-processor/annotation-processor-ref/pom.xml | 2 +-
odata2-annotation-processor/annotation-processor-web/pom.xml | 2 +-
odata2-annotation-processor/pom.xml | 2 +-
odata2-dist/janos/pom.xml | 2 +-
odata2-dist/javadoc/pom.xml | 2 +-
odata2-dist/jpa/pom.xml | 2 +-
odata2-dist/lib/pom.xml | 2 +-
odata2-dist/pom.xml | 2 +-
odata2-dist/ref/pom.xml | 2 +-
odata2-jpa-processor/jpa-api/pom.xml | 2 +-
odata2-jpa-processor/jpa-core/pom.xml | 2 +-
odata2-jpa-processor/jpa-ref/pom.xml | 2 +-
odata2-jpa-processor/jpa-web/pom.xml | 2 +-
odata2-jpa-processor/pom.xml | 2 +-
odata2-lib/odata-annotation/pom.xml | 2 +-
odata2-lib/odata-api/pom.xml | 2 +-
odata2-lib/odata-core/pom.xml | 2 +-
odata2-lib/odata-fit/pom.xml | 2 +-
odata2-lib/odata-ref/pom.xml | 2 +-
odata2-lib/odata-testutil/pom.xml | 2 +-
odata2-lib/odata-web/pom.xml | 2 +-
odata2-lib/pom.xml | 2 +-
odata2-sample/cars-annotation-archetype/pom.xml | 4 ++--
.../src/main/resources/archetype-resources/pom.xml | 2 +-
odata2-sample/cars-service-archetype/pom.xml | 4 ++--
.../src/main/resources/archetype-resources/pom.xml | 2 +-
odata2-sample/pom.xml | 2 +-
pom.xml | 2 +-
30 files changed, 32 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b0ebd532/odata2-annotation-processor/annotation-processor-api/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-api/pom.xml b/odata2-annotation-processor/annotation-processor-api/pom.xml
index 0182f33..df4d2d2 100644
--- a/odata2-annotation-processor/annotation-processor-api/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-api/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-annotation-processor-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC01</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b0ebd532/odata2-annotation-processor/annotation-processor-core/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/pom.xml b/odata2-annotation-processor/annotation-processor-core/pom.xml
index 8ed093e..bcbed83 100644
--- a/odata2-annotation-processor/annotation-processor-core/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-core/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-annotation-processor-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC01</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b0ebd532/odata2-annotation-processor/annotation-processor-ref/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-ref/pom.xml b/odata2-annotation-processor/annotation-processor-ref/pom.xml
index 4614af0..803087e 100644
--- a/odata2-annotation-processor/annotation-processor-ref/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-ref/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-annotation-processor-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC01</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b0ebd532/odata2-annotation-processor/annotation-processor-web/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-web/pom.xml b/odata2-annotation-processor/annotation-processor-web/pom.xml
index 5df9a18..7a6538c 100644
--- a/odata2-annotation-processor/annotation-processor-web/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-web/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-annotation-processor-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC01</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b0ebd532/odata2-annotation-processor/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/pom.xml b/odata2-annotation-processor/pom.xml
index 776a515..025bc78 100644
--- a/odata2-annotation-processor/pom.xml
+++ b/odata2-annotation-processor/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC01</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b0ebd532/odata2-dist/janos/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/janos/pom.xml b/odata2-dist/janos/pom.xml
index f6a3f81..ebc97de 100644
--- a/odata2-dist/janos/pom.xml
+++ b/odata2-dist/janos/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-dist-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC01</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b0ebd532/odata2-dist/javadoc/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/javadoc/pom.xml b/odata2-dist/javadoc/pom.xml
index 970e018..7fdeed3 100644
--- a/odata2-dist/javadoc/pom.xml
+++ b/odata2-dist/javadoc/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-dist-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC01</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b0ebd532/odata2-dist/jpa/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/jpa/pom.xml b/odata2-dist/jpa/pom.xml
index c026647..07ed561 100644
--- a/odata2-dist/jpa/pom.xml
+++ b/odata2-dist/jpa/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-dist-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC01</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b0ebd532/odata2-dist/lib/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/lib/pom.xml b/odata2-dist/lib/pom.xml
index 54b82aa..e6752eb 100644
--- a/odata2-dist/lib/pom.xml
+++ b/odata2-dist/lib/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-dist-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC01</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b0ebd532/odata2-dist/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/pom.xml b/odata2-dist/pom.xml
index 42f9705..22bdf82 100644
--- a/odata2-dist/pom.xml
+++ b/odata2-dist/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC01</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b0ebd532/odata2-dist/ref/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/ref/pom.xml b/odata2-dist/ref/pom.xml
index f6c0a42..e81a01f 100644
--- a/odata2-dist/ref/pom.xml
+++ b/odata2-dist/ref/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-dist-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC01</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b0ebd532/odata2-jpa-processor/jpa-api/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-api/pom.xml b/odata2-jpa-processor/jpa-api/pom.xml
index e987876..7ecafc1 100644
--- a/odata2-jpa-processor/jpa-api/pom.xml
+++ b/odata2-jpa-processor/jpa-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-jpa-processor-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC01</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b0ebd532/odata2-jpa-processor/jpa-core/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/pom.xml b/odata2-jpa-processor/jpa-core/pom.xml
index c9d1d2c..e514812 100644
--- a/odata2-jpa-processor/jpa-core/pom.xml
+++ b/odata2-jpa-processor/jpa-core/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-jpa-processor-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC01</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b0ebd532/odata2-jpa-processor/jpa-ref/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-ref/pom.xml b/odata2-jpa-processor/jpa-ref/pom.xml
index a44b7f1..9d5686c 100644
--- a/odata2-jpa-processor/jpa-ref/pom.xml
+++ b/odata2-jpa-processor/jpa-ref/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-jpa-processor-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC01</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b0ebd532/odata2-jpa-processor/jpa-web/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-web/pom.xml b/odata2-jpa-processor/jpa-web/pom.xml
index 00fabf2..c5d8de6 100644
--- a/odata2-jpa-processor/jpa-web/pom.xml
+++ b/odata2-jpa-processor/jpa-web/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-jpa-processor-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC01</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b0ebd532/odata2-jpa-processor/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/pom.xml b/odata2-jpa-processor/pom.xml
index c90be6f..8d79846 100644
--- a/odata2-jpa-processor/pom.xml
+++ b/odata2-jpa-processor/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC01</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b0ebd532/odata2-lib/odata-annotation/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-annotation/pom.xml b/odata2-lib/odata-annotation/pom.xml
index 650bd49..4caab3b 100644
--- a/odata2-lib/odata-annotation/pom.xml
+++ b/odata2-lib/odata-annotation/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC01</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b0ebd532/odata2-lib/odata-api/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-api/pom.xml b/odata2-lib/odata-api/pom.xml
index 8b5a7d6..2f6232d 100644
--- a/odata2-lib/odata-api/pom.xml
+++ b/odata2-lib/odata-api/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC01</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b0ebd532/odata2-lib/odata-core/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/pom.xml b/odata2-lib/odata-core/pom.xml
index 0151902..dc008a2 100644
--- a/odata2-lib/odata-core/pom.xml
+++ b/odata2-lib/odata-core/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC01</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b0ebd532/odata2-lib/odata-fit/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/pom.xml b/odata2-lib/odata-fit/pom.xml
index b3ea798..72b92e9 100644
--- a/odata2-lib/odata-fit/pom.xml
+++ b/odata2-lib/odata-fit/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC01</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b0ebd532/odata2-lib/odata-ref/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-ref/pom.xml b/odata2-lib/odata-ref/pom.xml
index 4727dba..44b8f45 100644
--- a/odata2-lib/odata-ref/pom.xml
+++ b/odata2-lib/odata-ref/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC01</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b0ebd532/odata2-lib/odata-testutil/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-testutil/pom.xml b/odata2-lib/odata-testutil/pom.xml
index 28f4f36..ccd90d8 100644
--- a/odata2-lib/odata-testutil/pom.xml
+++ b/odata2-lib/odata-testutil/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC01</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b0ebd532/odata2-lib/odata-web/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-web/pom.xml b/odata2-lib/odata-web/pom.xml
index 1dab758..e5f9cd1 100644
--- a/odata2-lib/odata-web/pom.xml
+++ b/odata2-lib/odata-web/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC01</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b0ebd532/odata2-lib/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/pom.xml b/odata2-lib/pom.xml
index be175b3..03cdc65 100644
--- a/odata2-lib/pom.xml
+++ b/odata2-lib/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC01</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b0ebd532/odata2-sample/cars-annotation-archetype/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-sample/cars-annotation-archetype/pom.xml b/odata2-sample/cars-annotation-archetype/pom.xml
index 459a1bf..97db1a8 100644
--- a/odata2-sample/cars-annotation-archetype/pom.xml
+++ b/odata2-sample/cars-annotation-archetype/pom.xml
@@ -16,13 +16,13 @@
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-sample-cars-annotation-archetype-incubating</artifactId>
<name>${project.artifactId}</name>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC01</version>
<packaging>maven-archetype</packaging>
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-sample-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC01</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b0ebd532/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml b/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml
index 828a291..175a190 100644
--- a/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml
@@ -32,7 +32,7 @@
<version.servlet-api>2.5</version.servlet-api>
<version.jaxrs-api>2.0-m10</version.jaxrs-api>
<version.slf4j>1.7.1</version.slf4j>
- <version.olingo>1.2.0-SNAPSHOT</version.olingo>
+ <version.olingo>1.1.0-RC01</version.olingo>
</properties>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b0ebd532/odata2-sample/cars-service-archetype/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-sample/cars-service-archetype/pom.xml b/odata2-sample/cars-service-archetype/pom.xml
index 68fb11e..305eacc 100644
--- a/odata2-sample/cars-service-archetype/pom.xml
+++ b/odata2-sample/cars-service-archetype/pom.xml
@@ -24,14 +24,14 @@
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-sample-cars-service-archetype-incubating</artifactId>
<name>${project.artifactId}</name>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC01</version>
<packaging>maven-archetype</packaging>
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-sample-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC01</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b0ebd532/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/pom.xml b/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/pom.xml
index 8430633..a983f5a 100644
--- a/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/pom.xml
@@ -20,7 +20,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<version.cxf>2.7.6</version.cxf>
<version.slf4j>1.7.1</version.slf4j>
- <version.olingo>1.2.0-SNAPSHOT</version.olingo>
+ <version.olingo>1.1.0-RC01</version.olingo>
</properties>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b0ebd532/odata2-sample/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-sample/pom.xml b/odata2-sample/pom.xml
index 82a897c..7968012 100644
--- a/odata2-sample/pom.xml
+++ b/odata2-sample/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC01</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b0ebd532/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 57de237..bfa1a26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC01</version>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
[11/14] git commit: [OLINGO-71] Set next Snapshot version again
1.2.0-SNAPSHOT
Posted by sk...@apache.org. [OLINGO-71] Set next Snapshot version again 1.2.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/commit/7a5ef025
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/7a5ef025
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/7a5ef025
Branch: refs/heads/olingo-117
Commit: 7a5ef0256f33ca82239eb89c9fea6df5ce500d74
Parents: b0ebd53
Author: Christian Amend <ch...@apache.org>
Authored: Wed Jan 22 14:33:12 2014 +0100
Committer: Christian Amend <ch...@apache.org>
Committed: Wed Jan 22 14:33:12 2014 +0100
----------------------------------------------------------------------
odata2-annotation-processor/annotation-processor-api/pom.xml | 2 +-
odata2-annotation-processor/annotation-processor-core/pom.xml | 2 +-
odata2-annotation-processor/annotation-processor-ref/pom.xml | 2 +-
odata2-annotation-processor/annotation-processor-web/pom.xml | 2 +-
odata2-annotation-processor/pom.xml | 2 +-
odata2-dist/janos/pom.xml | 2 +-
odata2-dist/javadoc/pom.xml | 2 +-
odata2-dist/jpa/pom.xml | 2 +-
odata2-dist/lib/pom.xml | 2 +-
odata2-dist/pom.xml | 2 +-
odata2-dist/ref/pom.xml | 2 +-
odata2-jpa-processor/jpa-api/pom.xml | 2 +-
odata2-jpa-processor/jpa-core/pom.xml | 2 +-
odata2-jpa-processor/jpa-ref/pom.xml | 2 +-
odata2-jpa-processor/jpa-web/pom.xml | 2 +-
odata2-jpa-processor/pom.xml | 2 +-
odata2-lib/odata-annotation/pom.xml | 2 +-
odata2-lib/odata-api/pom.xml | 2 +-
odata2-lib/odata-core/pom.xml | 2 +-
odata2-lib/odata-fit/pom.xml | 2 +-
odata2-lib/odata-ref/pom.xml | 2 +-
odata2-lib/odata-testutil/pom.xml | 2 +-
odata2-lib/odata-web/pom.xml | 2 +-
odata2-lib/pom.xml | 2 +-
odata2-sample/cars-annotation-archetype/pom.xml | 4 ++--
.../src/main/resources/archetype-resources/pom.xml | 2 +-
odata2-sample/cars-service-archetype/pom.xml | 4 ++--
.../src/main/resources/archetype-resources/pom.xml | 2 +-
odata2-sample/pom.xml | 2 +-
pom.xml | 2 +-
30 files changed, 32 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/7a5ef025/odata2-annotation-processor/annotation-processor-api/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-api/pom.xml b/odata2-annotation-processor/annotation-processor-api/pom.xml
index df4d2d2..0182f33 100644
--- a/odata2-annotation-processor/annotation-processor-api/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-api/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-annotation-processor-incubating</artifactId>
- <version>1.1.0-RC01</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/7a5ef025/odata2-annotation-processor/annotation-processor-core/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/pom.xml b/odata2-annotation-processor/annotation-processor-core/pom.xml
index bcbed83..8ed093e 100644
--- a/odata2-annotation-processor/annotation-processor-core/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-core/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-annotation-processor-incubating</artifactId>
- <version>1.1.0-RC01</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/7a5ef025/odata2-annotation-processor/annotation-processor-ref/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-ref/pom.xml b/odata2-annotation-processor/annotation-processor-ref/pom.xml
index 803087e..4614af0 100644
--- a/odata2-annotation-processor/annotation-processor-ref/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-ref/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-annotation-processor-incubating</artifactId>
- <version>1.1.0-RC01</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/7a5ef025/odata2-annotation-processor/annotation-processor-web/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-web/pom.xml b/odata2-annotation-processor/annotation-processor-web/pom.xml
index 7a6538c..5df9a18 100644
--- a/odata2-annotation-processor/annotation-processor-web/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-web/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-annotation-processor-incubating</artifactId>
- <version>1.1.0-RC01</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/7a5ef025/odata2-annotation-processor/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/pom.xml b/odata2-annotation-processor/pom.xml
index 025bc78..776a515 100644
--- a/odata2-annotation-processor/pom.xml
+++ b/odata2-annotation-processor/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent-incubating</artifactId>
- <version>1.1.0-RC01</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/7a5ef025/odata2-dist/janos/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/janos/pom.xml b/odata2-dist/janos/pom.xml
index ebc97de..f6a3f81 100644
--- a/odata2-dist/janos/pom.xml
+++ b/odata2-dist/janos/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-dist-incubating</artifactId>
- <version>1.1.0-RC01</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/7a5ef025/odata2-dist/javadoc/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/javadoc/pom.xml b/odata2-dist/javadoc/pom.xml
index 7fdeed3..970e018 100644
--- a/odata2-dist/javadoc/pom.xml
+++ b/odata2-dist/javadoc/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-dist-incubating</artifactId>
- <version>1.1.0-RC01</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/7a5ef025/odata2-dist/jpa/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/jpa/pom.xml b/odata2-dist/jpa/pom.xml
index 07ed561..c026647 100644
--- a/odata2-dist/jpa/pom.xml
+++ b/odata2-dist/jpa/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-dist-incubating</artifactId>
- <version>1.1.0-RC01</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/7a5ef025/odata2-dist/lib/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/lib/pom.xml b/odata2-dist/lib/pom.xml
index e6752eb..54b82aa 100644
--- a/odata2-dist/lib/pom.xml
+++ b/odata2-dist/lib/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-dist-incubating</artifactId>
- <version>1.1.0-RC01</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/7a5ef025/odata2-dist/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/pom.xml b/odata2-dist/pom.xml
index 22bdf82..42f9705 100644
--- a/odata2-dist/pom.xml
+++ b/odata2-dist/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent-incubating</artifactId>
- <version>1.1.0-RC01</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/7a5ef025/odata2-dist/ref/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/ref/pom.xml b/odata2-dist/ref/pom.xml
index e81a01f..f6c0a42 100644
--- a/odata2-dist/ref/pom.xml
+++ b/odata2-dist/ref/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-dist-incubating</artifactId>
- <version>1.1.0-RC01</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/7a5ef025/odata2-jpa-processor/jpa-api/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-api/pom.xml b/odata2-jpa-processor/jpa-api/pom.xml
index 7ecafc1..e987876 100644
--- a/odata2-jpa-processor/jpa-api/pom.xml
+++ b/odata2-jpa-processor/jpa-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-jpa-processor-incubating</artifactId>
- <version>1.1.0-RC01</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/7a5ef025/odata2-jpa-processor/jpa-core/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/pom.xml b/odata2-jpa-processor/jpa-core/pom.xml
index e514812..c9d1d2c 100644
--- a/odata2-jpa-processor/jpa-core/pom.xml
+++ b/odata2-jpa-processor/jpa-core/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-jpa-processor-incubating</artifactId>
- <version>1.1.0-RC01</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/7a5ef025/odata2-jpa-processor/jpa-ref/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-ref/pom.xml b/odata2-jpa-processor/jpa-ref/pom.xml
index 9d5686c..a44b7f1 100644
--- a/odata2-jpa-processor/jpa-ref/pom.xml
+++ b/odata2-jpa-processor/jpa-ref/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-jpa-processor-incubating</artifactId>
- <version>1.1.0-RC01</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/7a5ef025/odata2-jpa-processor/jpa-web/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-web/pom.xml b/odata2-jpa-processor/jpa-web/pom.xml
index c5d8de6..00fabf2 100644
--- a/odata2-jpa-processor/jpa-web/pom.xml
+++ b/odata2-jpa-processor/jpa-web/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-jpa-processor-incubating</artifactId>
- <version>1.1.0-RC01</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/7a5ef025/odata2-jpa-processor/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/pom.xml b/odata2-jpa-processor/pom.xml
index 8d79846..c90be6f 100644
--- a/odata2-jpa-processor/pom.xml
+++ b/odata2-jpa-processor/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent-incubating</artifactId>
- <version>1.1.0-RC01</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/7a5ef025/odata2-lib/odata-annotation/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-annotation/pom.xml b/odata2-lib/odata-annotation/pom.xml
index 4caab3b..650bd49 100644
--- a/odata2-lib/odata-annotation/pom.xml
+++ b/odata2-lib/odata-annotation/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib-incubating</artifactId>
- <version>1.1.0-RC01</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/7a5ef025/odata2-lib/odata-api/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-api/pom.xml b/odata2-lib/odata-api/pom.xml
index 2f6232d..8b5a7d6 100644
--- a/odata2-lib/odata-api/pom.xml
+++ b/odata2-lib/odata-api/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib-incubating</artifactId>
- <version>1.1.0-RC01</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/7a5ef025/odata2-lib/odata-core/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/pom.xml b/odata2-lib/odata-core/pom.xml
index dc008a2..0151902 100644
--- a/odata2-lib/odata-core/pom.xml
+++ b/odata2-lib/odata-core/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib-incubating</artifactId>
- <version>1.1.0-RC01</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/7a5ef025/odata2-lib/odata-fit/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/pom.xml b/odata2-lib/odata-fit/pom.xml
index 72b92e9..b3ea798 100644
--- a/odata2-lib/odata-fit/pom.xml
+++ b/odata2-lib/odata-fit/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib-incubating</artifactId>
- <version>1.1.0-RC01</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/7a5ef025/odata2-lib/odata-ref/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-ref/pom.xml b/odata2-lib/odata-ref/pom.xml
index 44b8f45..4727dba 100644
--- a/odata2-lib/odata-ref/pom.xml
+++ b/odata2-lib/odata-ref/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib-incubating</artifactId>
- <version>1.1.0-RC01</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/7a5ef025/odata2-lib/odata-testutil/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-testutil/pom.xml b/odata2-lib/odata-testutil/pom.xml
index ccd90d8..28f4f36 100644
--- a/odata2-lib/odata-testutil/pom.xml
+++ b/odata2-lib/odata-testutil/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib-incubating</artifactId>
- <version>1.1.0-RC01</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/7a5ef025/odata2-lib/odata-web/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-web/pom.xml b/odata2-lib/odata-web/pom.xml
index e5f9cd1..1dab758 100644
--- a/odata2-lib/odata-web/pom.xml
+++ b/odata2-lib/odata-web/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib-incubating</artifactId>
- <version>1.1.0-RC01</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/7a5ef025/odata2-lib/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/pom.xml b/odata2-lib/pom.xml
index 03cdc65..be175b3 100644
--- a/odata2-lib/pom.xml
+++ b/odata2-lib/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent-incubating</artifactId>
- <version>1.1.0-RC01</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/7a5ef025/odata2-sample/cars-annotation-archetype/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-sample/cars-annotation-archetype/pom.xml b/odata2-sample/cars-annotation-archetype/pom.xml
index 97db1a8..459a1bf 100644
--- a/odata2-sample/cars-annotation-archetype/pom.xml
+++ b/odata2-sample/cars-annotation-archetype/pom.xml
@@ -16,13 +16,13 @@
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-sample-cars-annotation-archetype-incubating</artifactId>
<name>${project.artifactId}</name>
- <version>1.1.0-RC01</version>
+ <version>1.2.0-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-sample-incubating</artifactId>
- <version>1.1.0-RC01</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/7a5ef025/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml b/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml
index 175a190..828a291 100644
--- a/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml
@@ -32,7 +32,7 @@
<version.servlet-api>2.5</version.servlet-api>
<version.jaxrs-api>2.0-m10</version.jaxrs-api>
<version.slf4j>1.7.1</version.slf4j>
- <version.olingo>1.1.0-RC01</version.olingo>
+ <version.olingo>1.2.0-SNAPSHOT</version.olingo>
</properties>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/7a5ef025/odata2-sample/cars-service-archetype/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-sample/cars-service-archetype/pom.xml b/odata2-sample/cars-service-archetype/pom.xml
index 305eacc..68fb11e 100644
--- a/odata2-sample/cars-service-archetype/pom.xml
+++ b/odata2-sample/cars-service-archetype/pom.xml
@@ -24,14 +24,14 @@
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-sample-cars-service-archetype-incubating</artifactId>
<name>${project.artifactId}</name>
- <version>1.1.0-RC01</version>
+ <version>1.2.0-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-sample-incubating</artifactId>
- <version>1.1.0-RC01</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/7a5ef025/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/pom.xml b/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/pom.xml
index a983f5a..8430633 100644
--- a/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/pom.xml
@@ -20,7 +20,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<version.cxf>2.7.6</version.cxf>
<version.slf4j>1.7.1</version.slf4j>
- <version.olingo>1.1.0-RC01</version.olingo>
+ <version.olingo>1.2.0-SNAPSHOT</version.olingo>
</properties>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/7a5ef025/odata2-sample/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-sample/pom.xml b/odata2-sample/pom.xml
index 7968012..82a897c 100644
--- a/odata2-sample/pom.xml
+++ b/odata2-sample/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent-incubating</artifactId>
- <version>1.1.0-RC01</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/7a5ef025/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index bfa1a26..57de237 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent-incubating</artifactId>
- <version>1.1.0-RC01</version>
+ <version>1.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
[12/14] git commit: [OLINGO-134] Added exclude for API classes
Posted by sk...@apache.org. [OLINGO-134] Added exclude for API classes
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/commit/39b92768
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/39b92768
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/39b92768
Branch: refs/heads/olingo-117
Commit: 39b92768d63e151605f74fe5a99cbf0cc9c64866
Parents: 7a5ef02
Author: Michael Bolz <mi...@sap.com>
Authored: Wed Jan 22 15:34:55 2014 +0100
Committer: Michael Bolz <mi...@sap.com>
Committed: Wed Jan 22 15:34:55 2014 +0100
----------------------------------------------------------------------
pom.xml | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/39b92768/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 57de237..2a86628 100644
--- a/pom.xml
+++ b/pom.xml
@@ -154,6 +154,11 @@
<artifactId>maven-war-plugin</artifactId>
<version>2.4</version>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>2.6</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -266,6 +271,17 @@
</webResources>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <configuration>
+ <instrumentation>
+ <excludes>
+ <exclude>org/apache/olingo/odata2/**/api/**/*.class</exclude>
+ </excludes>
+ </instrumentation>
+ </configuration>
+ </plugin>
</plugins>
</build>
[09/14] git commit: [OLINGO-71] Set new snapshot version 1.2.0 again
Posted by sk...@apache.org. [OLINGO-71] Set new snapshot version 1.2.0 again
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/commit/8e82c15a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/8e82c15a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/8e82c15a
Branch: refs/heads/olingo-117
Commit: 8e82c15a6a393f45b8144489fb93167a1204759a
Parents: 2ec7e20
Author: Christian Amend <ch...@apache.org>
Authored: Tue Jan 21 16:16:38 2014 +0100
Committer: Christian Amend <ch...@apache.org>
Committed: Tue Jan 21 16:16:38 2014 +0100
----------------------------------------------------------------------
odata2-annotation-processor/annotation-processor-api/pom.xml | 2 +-
odata2-annotation-processor/annotation-processor-core/pom.xml | 2 +-
odata2-annotation-processor/annotation-processor-ref/pom.xml | 2 +-
odata2-annotation-processor/annotation-processor-web/pom.xml | 2 +-
odata2-annotation-processor/pom.xml | 2 +-
odata2-dist/janos/pom.xml | 2 +-
odata2-dist/javadoc/pom.xml | 2 +-
odata2-dist/jpa/pom.xml | 2 +-
odata2-dist/lib/pom.xml | 2 +-
odata2-dist/pom.xml | 2 +-
odata2-dist/ref/pom.xml | 2 +-
odata2-jpa-processor/jpa-api/pom.xml | 2 +-
odata2-jpa-processor/jpa-core/pom.xml | 2 +-
odata2-jpa-processor/jpa-ref/pom.xml | 2 +-
odata2-jpa-processor/jpa-web/pom.xml | 2 +-
odata2-jpa-processor/pom.xml | 2 +-
odata2-lib/odata-annotation/pom.xml | 2 +-
odata2-lib/odata-api/pom.xml | 2 +-
odata2-lib/odata-core/pom.xml | 2 +-
odata2-lib/odata-fit/pom.xml | 2 +-
odata2-lib/odata-ref/pom.xml | 2 +-
odata2-lib/odata-testutil/pom.xml | 2 +-
odata2-lib/odata-web/pom.xml | 2 +-
odata2-lib/pom.xml | 2 +-
odata2-sample/cars-annotation-archetype/pom.xml | 4 ++--
odata2-sample/cars-service-archetype/pom.xml | 4 ++--
odata2-sample/pom.xml | 2 +-
pom.xml | 2 +-
28 files changed, 30 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/8e82c15a/odata2-annotation-processor/annotation-processor-api/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-api/pom.xml b/odata2-annotation-processor/annotation-processor-api/pom.xml
index af1f50b..0182f33 100644
--- a/odata2-annotation-processor/annotation-processor-api/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-api/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-annotation-processor-incubating</artifactId>
- <version>1.1.0-RC02</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/8e82c15a/odata2-annotation-processor/annotation-processor-core/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/pom.xml b/odata2-annotation-processor/annotation-processor-core/pom.xml
index 4df6246..8ed093e 100644
--- a/odata2-annotation-processor/annotation-processor-core/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-core/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-annotation-processor-incubating</artifactId>
- <version>1.1.0-RC02</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/8e82c15a/odata2-annotation-processor/annotation-processor-ref/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-ref/pom.xml b/odata2-annotation-processor/annotation-processor-ref/pom.xml
index 8b74ce7..4614af0 100644
--- a/odata2-annotation-processor/annotation-processor-ref/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-ref/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-annotation-processor-incubating</artifactId>
- <version>1.1.0-RC02</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/8e82c15a/odata2-annotation-processor/annotation-processor-web/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-web/pom.xml b/odata2-annotation-processor/annotation-processor-web/pom.xml
index 221b5f0..5df9a18 100644
--- a/odata2-annotation-processor/annotation-processor-web/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-web/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-annotation-processor-incubating</artifactId>
- <version>1.1.0-RC02</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/8e82c15a/odata2-annotation-processor/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/pom.xml b/odata2-annotation-processor/pom.xml
index 90471e8..776a515 100644
--- a/odata2-annotation-processor/pom.xml
+++ b/odata2-annotation-processor/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent-incubating</artifactId>
- <version>1.1.0-RC02</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/8e82c15a/odata2-dist/janos/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/janos/pom.xml b/odata2-dist/janos/pom.xml
index 73e98a9..f6a3f81 100644
--- a/odata2-dist/janos/pom.xml
+++ b/odata2-dist/janos/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-dist-incubating</artifactId>
- <version>1.1.0-RC02</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/8e82c15a/odata2-dist/javadoc/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/javadoc/pom.xml b/odata2-dist/javadoc/pom.xml
index cd5f511..970e018 100644
--- a/odata2-dist/javadoc/pom.xml
+++ b/odata2-dist/javadoc/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-dist-incubating</artifactId>
- <version>1.1.0-RC02</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/8e82c15a/odata2-dist/jpa/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/jpa/pom.xml b/odata2-dist/jpa/pom.xml
index 8a4173f..c026647 100644
--- a/odata2-dist/jpa/pom.xml
+++ b/odata2-dist/jpa/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-dist-incubating</artifactId>
- <version>1.1.0-RC02</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/8e82c15a/odata2-dist/lib/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/lib/pom.xml b/odata2-dist/lib/pom.xml
index 42da502..54b82aa 100644
--- a/odata2-dist/lib/pom.xml
+++ b/odata2-dist/lib/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-dist-incubating</artifactId>
- <version>1.1.0-RC02</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/8e82c15a/odata2-dist/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/pom.xml b/odata2-dist/pom.xml
index ac9efea..42f9705 100644
--- a/odata2-dist/pom.xml
+++ b/odata2-dist/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent-incubating</artifactId>
- <version>1.1.0-RC02</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/8e82c15a/odata2-dist/ref/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/ref/pom.xml b/odata2-dist/ref/pom.xml
index 9f5610f..f6c0a42 100644
--- a/odata2-dist/ref/pom.xml
+++ b/odata2-dist/ref/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-dist-incubating</artifactId>
- <version>1.1.0-RC02</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/8e82c15a/odata2-jpa-processor/jpa-api/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-api/pom.xml b/odata2-jpa-processor/jpa-api/pom.xml
index 8e591e8..e987876 100644
--- a/odata2-jpa-processor/jpa-api/pom.xml
+++ b/odata2-jpa-processor/jpa-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-jpa-processor-incubating</artifactId>
- <version>1.1.0-RC02</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/8e82c15a/odata2-jpa-processor/jpa-core/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/pom.xml b/odata2-jpa-processor/jpa-core/pom.xml
index 94739df..c9d1d2c 100644
--- a/odata2-jpa-processor/jpa-core/pom.xml
+++ b/odata2-jpa-processor/jpa-core/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-jpa-processor-incubating</artifactId>
- <version>1.1.0-RC02</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/8e82c15a/odata2-jpa-processor/jpa-ref/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-ref/pom.xml b/odata2-jpa-processor/jpa-ref/pom.xml
index 78228e9..a44b7f1 100644
--- a/odata2-jpa-processor/jpa-ref/pom.xml
+++ b/odata2-jpa-processor/jpa-ref/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-jpa-processor-incubating</artifactId>
- <version>1.1.0-RC02</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/8e82c15a/odata2-jpa-processor/jpa-web/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-web/pom.xml b/odata2-jpa-processor/jpa-web/pom.xml
index c6df159..00fabf2 100644
--- a/odata2-jpa-processor/jpa-web/pom.xml
+++ b/odata2-jpa-processor/jpa-web/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-jpa-processor-incubating</artifactId>
- <version>1.1.0-RC02</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/8e82c15a/odata2-jpa-processor/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/pom.xml b/odata2-jpa-processor/pom.xml
index 10e187a..c90be6f 100644
--- a/odata2-jpa-processor/pom.xml
+++ b/odata2-jpa-processor/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent-incubating</artifactId>
- <version>1.1.0-RC02</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/8e82c15a/odata2-lib/odata-annotation/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-annotation/pom.xml b/odata2-lib/odata-annotation/pom.xml
index 5706c64..650bd49 100644
--- a/odata2-lib/odata-annotation/pom.xml
+++ b/odata2-lib/odata-annotation/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib-incubating</artifactId>
- <version>1.1.0-RC02</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/8e82c15a/odata2-lib/odata-api/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-api/pom.xml b/odata2-lib/odata-api/pom.xml
index 4a94994..8b5a7d6 100644
--- a/odata2-lib/odata-api/pom.xml
+++ b/odata2-lib/odata-api/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib-incubating</artifactId>
- <version>1.1.0-RC02</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/8e82c15a/odata2-lib/odata-core/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/pom.xml b/odata2-lib/odata-core/pom.xml
index 74dc38c..0151902 100644
--- a/odata2-lib/odata-core/pom.xml
+++ b/odata2-lib/odata-core/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib-incubating</artifactId>
- <version>1.1.0-RC02</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/8e82c15a/odata2-lib/odata-fit/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/pom.xml b/odata2-lib/odata-fit/pom.xml
index 3570952..b3ea798 100644
--- a/odata2-lib/odata-fit/pom.xml
+++ b/odata2-lib/odata-fit/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib-incubating</artifactId>
- <version>1.1.0-RC02</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/8e82c15a/odata2-lib/odata-ref/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-ref/pom.xml b/odata2-lib/odata-ref/pom.xml
index 0e06702..4727dba 100644
--- a/odata2-lib/odata-ref/pom.xml
+++ b/odata2-lib/odata-ref/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib-incubating</artifactId>
- <version>1.1.0-RC02</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/8e82c15a/odata2-lib/odata-testutil/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-testutil/pom.xml b/odata2-lib/odata-testutil/pom.xml
index 6cff762..28f4f36 100644
--- a/odata2-lib/odata-testutil/pom.xml
+++ b/odata2-lib/odata-testutil/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib-incubating</artifactId>
- <version>1.1.0-RC02</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/8e82c15a/odata2-lib/odata-web/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-web/pom.xml b/odata2-lib/odata-web/pom.xml
index 1d0431f..1dab758 100644
--- a/odata2-lib/odata-web/pom.xml
+++ b/odata2-lib/odata-web/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib-incubating</artifactId>
- <version>1.1.0-RC02</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/8e82c15a/odata2-lib/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/pom.xml b/odata2-lib/pom.xml
index d3adeea..be175b3 100644
--- a/odata2-lib/pom.xml
+++ b/odata2-lib/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent-incubating</artifactId>
- <version>1.1.0-RC02</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/8e82c15a/odata2-sample/cars-annotation-archetype/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-sample/cars-annotation-archetype/pom.xml b/odata2-sample/cars-annotation-archetype/pom.xml
index 0b67db9..459a1bf 100644
--- a/odata2-sample/cars-annotation-archetype/pom.xml
+++ b/odata2-sample/cars-annotation-archetype/pom.xml
@@ -16,13 +16,13 @@
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-sample-cars-annotation-archetype-incubating</artifactId>
<name>${project.artifactId}</name>
- <version>1.1.0-RC02</version>
+ <version>1.2.0-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-sample-incubating</artifactId>
- <version>1.1.0-RC02</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/8e82c15a/odata2-sample/cars-service-archetype/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-sample/cars-service-archetype/pom.xml b/odata2-sample/cars-service-archetype/pom.xml
index beac7af..68fb11e 100644
--- a/odata2-sample/cars-service-archetype/pom.xml
+++ b/odata2-sample/cars-service-archetype/pom.xml
@@ -24,14 +24,14 @@
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-sample-cars-service-archetype-incubating</artifactId>
<name>${project.artifactId}</name>
- <version>1.1.0-RC02</version>
+ <version>1.2.0-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-sample-incubating</artifactId>
- <version>1.1.0-RC02</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/8e82c15a/odata2-sample/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-sample/pom.xml b/odata2-sample/pom.xml
index ac44f46..82a897c 100644
--- a/odata2-sample/pom.xml
+++ b/odata2-sample/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent-incubating</artifactId>
- <version>1.1.0-RC02</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/8e82c15a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9442279..57de237 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent-incubating</artifactId>
- <version>1.1.0-RC02</version>
+ <version>1.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
[04/14] git commit: [OLINGO-109] Fix for on expanded entries
Posted by sk...@apache.org. [OLINGO-109] Fix for on expanded entries
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/commit/22164610
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/22164610
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/22164610
Branch: refs/heads/olingo-117
Commit: 22164610bc1fd2bd48acc71fed1f1a7822ec4f48
Parents: 53984da
Author: Chandan V A <ch...@sap.com>
Authored: Mon Jan 20 18:33:15 2014 +0530
Committer: Chandan V A <ch...@sap.com>
Committed: Mon Jan 20 18:33:15 2014 +0530
----------------------------------------------------------------------
.../core/ODataJPAResponseBuilderDefault.java | 19 +-
.../core/access/data/JPAEntityParser.java | 389 +++++++++----------
.../core/access/data/JPAExpandCallBack.java | 47 ++-
.../jpa/processor/core/access/data/JPALink.java | 8 +-
.../core/access/data/JPAEntityParserTest.java | 50 +--
.../JPAEntityParserTestForStaticMethods.java | 18 +-
.../processor/core/mock/data/EdmMockUtil.java | 16 +-
7 files changed, 270 insertions(+), 277 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/22164610/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPAResponseBuilderDefault.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPAResponseBuilderDefault.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPAResponseBuilderDefault.java
index 2a5e446..04a0fbd 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPAResponseBuilderDefault.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPAResponseBuilderDefault.java
@@ -83,21 +83,14 @@ public final class ODataJPAResponseBuilderDefault implements ODataJPAResponseBui
try {
edmEntityType = resultsView.getTargetEntitySet().getEntityType();
- List<Map<String, Object>> edmEntityList = new ArrayList<Map<String, Object>>();
- Map<String, Object> edmPropertyValueMap = null;
+ List<Map<String, Object>> edmEntityList = null;
JPAEntityParser jpaResultParser = new JPAEntityParser();
final List<SelectItem> selectedItems = resultsView.getSelect();
if (selectedItems != null && selectedItems.size() > 0) {
- for (Object jpaEntity : jpaEntities) {
- edmPropertyValueMap =
- jpaResultParser.parse2EdmPropertyValueMap(jpaEntity, buildSelectItemList(selectedItems, edmEntityType));
- edmEntityList.add(edmPropertyValueMap);
- }
+ edmEntityList =
+ jpaResultParser.parse2EdmEntityList(jpaEntities, buildSelectItemList(selectedItems, edmEntityType));
} else {
- for (Object jpaEntity : jpaEntities) {
- edmPropertyValueMap = jpaResultParser.parse2EdmPropertyValueMap(jpaEntity, edmEntityType);
- edmEntityList.add(edmPropertyValueMap);
- }
+ edmEntityList = jpaResultParser.parse2EdmEntityList(jpaEntities, edmEntityType);
}
expandList = resultsView.getExpand();
if (expandList != null && expandList.size() != 0) {
@@ -572,7 +565,9 @@ public final class ODataJPAResponseBuilderDefault implements ODataJPAResponseBui
List<EdmProperty> selectPropertyList = new ArrayList<EdmProperty>();
try {
for (SelectItem selectItem : selectItems) {
- selectPropertyList.add(selectItem.getProperty());
+ if (selectItem.getNavigationPropertySegments().size() <= 0) {
+ selectPropertyList.add(selectItem.getProperty());
+ }
}
for (EdmProperty keyProperty : entity.getKeyProperties()) {
flag = true;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/22164610/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParser.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParser.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParser.java
index dd030ce..f0ff44f 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParser.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParser.java
@@ -20,8 +20,11 @@ package org.apache.olingo.odata2.jpa.processor.core.access.data;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collection;
import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import org.apache.olingo.odata2.api.edm.EdmAssociationEnd;
import org.apache.olingo.odata2.api.edm.EdmException;
@@ -32,6 +35,8 @@ import org.apache.olingo.odata2.api.edm.EdmSimpleType;
import org.apache.olingo.odata2.api.edm.EdmSimpleTypeKind;
import org.apache.olingo.odata2.api.edm.EdmStructuralType;
import org.apache.olingo.odata2.api.edm.EdmTypeKind;
+import org.apache.olingo.odata2.api.uri.NavigationPropertySegment;
+import org.apache.olingo.odata2.api.uri.SelectItem;
import org.apache.olingo.odata2.jpa.processor.api.exception.ODataJPARuntimeException;
import org.apache.olingo.odata2.jpa.processor.api.model.JPAEdmMapping;
@@ -62,67 +67,73 @@ public final class JPAEntityParser {
return jpaEmbeddableKeyMap.get(jpaEntityName);
}
- /**
- * The method returns a Hash Map of Properties and values for selected
- * properties of an EdmEntity Type
- *
- * @param jpaEntity
- * @param selectedItems
- * @return a Hash Map of Properties and values for given selected properties
- * of an EdmEntity Type
- * @throws ODataJPARuntimeException
- */
-
- public final HashMap<String, Object> parse2EdmPropertyValueMap(
- final Object jpaEntity, final List<EdmProperty> selectPropertyList)
+ public List<Map<String, Object>> parse2EdmEntityList(Collection<Object> jpaEntityList, List<EdmProperty> properties)
throws ODataJPARuntimeException {
+
+ if (jpaEntityList == null) {
+ return null;
+ }
+ List<Map<String, Object>> edmEntityList = new ArrayList<Map<String, Object>>();
+ for (Object item : jpaEntityList) {
+ edmEntityList.add(parse2EdmPropertyValueMap(item, properties));
+ }
+
+ return edmEntityList;
+ }
+
+ @SuppressWarnings("unchecked")
+ public final <T> HashMap<String, Object> parse2EdmPropertyValueMap(final Object jpaEntity,
+ final List<T> selectPropertyList) throws ODataJPARuntimeException {
+
HashMap<String, Object> edmEntity = new HashMap<String, Object>();
- String methodName = null;
- Method method = null;
- for (int i = 0; i < selectPropertyList.size(); i++) {
- String key = null;
- Object propertyValue = null;
- EdmProperty property = null;
- property = selectPropertyList.get(i);
+ HashMap<String, Method> accessModifierMap = null;
+ Object propertyValue = null;
+ EdmProperty property = null;
+ String jpaEntityAccessKey = null;
+
+ if (selectPropertyList.get(0) instanceof EdmProperty) {
+ jpaEntityAccessKey = jpaEntity.getClass().getName();
+ if (!jpaEntityAccessMap.containsKey(jpaEntityAccessKey)) {
+ accessModifierMap =
+ getAccessModifiers((List<EdmProperty>) selectPropertyList, jpaEntity.getClass(), ACCESS_MODIFIER_GET);
+ } else {
+ accessModifierMap = jpaEntityAccessMap.get(jpaEntityAccessKey);
+ }
+ }
+ for (Object item : selectPropertyList) {
+ propertyValue = jpaEntity;
+ if (item instanceof SelectItem) {
+ SelectItem selectItem = (SelectItem) item;
+ for (NavigationPropertySegment navPropSegement : selectItem.getNavigationPropertySegments()) {
+ Method method =
+ getAccessModifier(propertyValue.getClass(), navPropSegement.getNavigationProperty(), ACCESS_MODIFIER_GET);
+ propertyValue = getPropertyValue(method, propertyValue);
+ }
+ property = selectItem.getProperty();
+ } else if (item instanceof EdmProperty) {
+ property = (EdmProperty) item;
+ }
try {
- methodName = getAccessModifierName(property.getName(),
- property.getMapping(), ACCESS_MODIFIER_GET);
- String[] nameParts = methodName.split("\\.");
- if (nameParts.length > 1) {
- Object propertyVal = new Object();
- propertyVal = jpaEntity;
- for (String namePart : nameParts) {
- method = propertyVal.getClass().getMethod(
- namePart, (Class<?>[]) null);
- method.setAccessible(true);
- propertyVal = getProperty(method, propertyVal);
+ String propertyName = property.getName();
+ Method method = accessModifierMap.get(propertyName);
+ if (method == null) {
+ String methodName = jpaEmbeddableKeyMap.get(jpaEntityAccessKey).get(propertyName);
+ if (methodName != null) {
+ propertyValue = getEmbeddablePropertyValue(methodName, propertyValue);
}
- edmEntity.put(property.getName(), propertyVal);
} else {
- method = jpaEntity.getClass().getMethod(methodName,
- (Class<?>[]) null);
- method.setAccessible(true);
- propertyValue = getProperty(method, jpaEntity);
- key = property.getName();
- if (property.getType().getKind()
- .equals(EdmTypeKind.COMPLEX)) {
- try {
- propertyValue = parse2EdmPropertyValueMap(
- propertyValue,
- (EdmStructuralType) property.getType());
- } catch (ODataJPARuntimeException e) {
- throw e;
- }
- }
- edmEntity.put(key, propertyValue);
+ propertyValue = getPropertyValue(accessModifierMap.get(propertyName), propertyValue);
}
+ if (property.getType().getKind()
+ .equals(EdmTypeKind.COMPLEX)) {
+ propertyValue = parse2EdmPropertyValueMap(propertyValue, (EdmStructuralType) property.getType());
+ }
+ edmEntity.put(propertyName, propertyValue);
} catch (EdmException e) {
throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e);
} catch (SecurityException e) {
throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e);
- } catch (NoSuchMethodException e) {
- throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e);
} catch (IllegalArgumentException e) {
throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e);
}
@@ -131,92 +142,28 @@ public final class JPAEntityParser {
return edmEntity;
}
- /**
- * The method returns a Hash Map of Properties and values for an EdmEntity
- * Type The method uses reflection on object jpaEntity to get the list of
- * accessModifier method. Then uses the accessModifier method to extract the value from
- * JPAEntity.
- *
- * @param jpaEntity
- * @param structuralType
- * @return a Hash Map of Properties and values for given EdmEntity Type
- * @throws ODataJPARuntimeException
- */
- public final HashMap<String, Object> parse2EdmPropertyValueMap(
- final Object jpaEntity, final EdmStructuralType structuralType)
- throws ODataJPARuntimeException {
-
- if (jpaEntity == null || structuralType == null) {
+ public final List<Map<String, Object>> parse2EdmEntityList(final Collection<Object> jpaEntityList,
+ final EdmStructuralType structuralType) throws ODataJPARuntimeException {
+ if (jpaEntityList == null || structuralType == null) {
return null;
}
-
- String jpaEntityAccessKey = jpaEntity.getClass().getName();
-
- if (!jpaEntityAccessMap.containsKey(jpaEntityAccessKey)) {
- jpaEntityAccessMap.put(jpaEntityAccessKey,
- getAccessModifiers(jpaEntity, structuralType, ACCESS_MODIFIER_GET));
+ List<EdmProperty> edmProperties = getEdmProperties(structuralType);
+ List<Map<String, Object>> edmEntityList = new ArrayList<Map<String, Object>>();
+ for (Object jpaEntity : jpaEntityList) {
+ edmEntityList.add(parse2EdmPropertyValueMap(jpaEntity, edmProperties));
}
- HashMap<String, Object> edmEntity = new HashMap<String, Object>();
- HashMap<String, Method> getters = jpaEntityAccessMap
- .get(jpaEntityAccessKey);
- HashMap<String, String> embeddableKeys = jpaEmbeddableKeyMap
- .get(jpaEntityAccessKey);
-
- try {
- for (String key : getters.keySet()) {
-
- EdmProperty property = (EdmProperty) structuralType
- .getProperty(key);
-
- Method method = getters.get(key);
- Object propertyValue = null;
-
- if (method != null) {
- getters.get(key).setAccessible(true);
- propertyValue = getProperty(method, jpaEntity);
- }
- if (property.getType().getKind().equals(EdmTypeKind.COMPLEX)) {
- propertyValue = parse2EdmPropertyValueMap(propertyValue,
- (EdmStructuralType) property.getType());
- }
-
- edmEntity.put(key, propertyValue);
-
- }
+ return edmEntityList;
+ }
- if (embeddableKeys != null) {
- for (String key : embeddableKeys.keySet()) {
- String name = embeddableKeys.get(key);
- String[] nameParts = name.split("\\.");
- Object propertyValue = jpaEntity;
- Method method = null;
- for (String namePart : nameParts) {
- if (propertyValue == null) {
- break;
- }
- method = propertyValue.getClass().getMethod(
- namePart, (Class<?>[]) null);
- method.setAccessible(true);
- propertyValue = getProperty(method, propertyValue);
- }
- edmEntity.put(key, propertyValue);
- }
- }
- } catch (EdmException e) {
- throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e);
- } catch (SecurityException e) {
- throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e);
- } catch (NoSuchMethodException e) {
- throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e);
- } catch (IllegalArgumentException e) {
- throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e);
+ public final HashMap<String, Object> parse2EdmPropertyValueMap(final Object jpaEntity,
+ final EdmStructuralType structuralType) throws ODataJPARuntimeException {
+ if (jpaEntity == null || structuralType == null) {
+ return null;
}
- return edmEntity;
+ return parse2EdmPropertyValueMap(jpaEntity, getEdmProperties(structuralType));
}
- // This method appends the associated entities as a java list to an expanded
- // map of a source entity
public final HashMap<String, Object> parse2EdmNavigationValueMap(
final Object jpaEntity, final List<EdmNavigationProperty> navigationPropertyList)
throws ODataJPARuntimeException {
@@ -233,7 +180,7 @@ public final class JPAEntityParser {
Method getterMethod = jpaEntity.getClass()
.getDeclaredMethod(methodName, (Class<?>[]) null);
getterMethod.setAccessible(true);
- result = getProperty(getterMethod, jpaEntity);
+ result = getPropertyValue(getterMethod, jpaEntity);
navigationMap.put(navigationProperty.getName(), result);
}
} catch (IllegalArgumentException e) {
@@ -269,75 +216,16 @@ public final class JPAEntityParser {
public HashMap<String, Method> getAccessModifiers(final Object jpaEntity,
final EdmStructuralType structuralType, final String accessModifier) throws ODataJPARuntimeException {
-
- HashMap<String, Method> accessModifierMap = new HashMap<String, Method>();
- HashMap<String, String> embeddableKey = new HashMap<String, String>();
- Method acceserMethod = null;
- EdmProperty property = null;
- try {
- for (String propertyName : structuralType.getPropertyNames()) {
- try {
- property = (EdmProperty) structuralType
- .getProperty(propertyName);
-
- String name = getAccessModifierName(property.getName(),
- property.getMapping(), accessModifier);
- String[] nameParts = name.split("\\.");
- if (nameParts.length > 1) {
- embeddableKey.put(propertyName, name);
- } else {
- if (accessModifier.equals(ACCESS_MODIFIER_SET)) {
- JPAEdmMapping jpaEdmMapping = (JPAEdmMapping) property.getMapping();
- accessModifierMap.put(
- propertyName,
- jpaEntity.getClass().getMethod(name, new Class<?>[] { jpaEdmMapping.getJPAType() }));
- } else {
- acceserMethod = jpaEntity.getClass().getMethod(name, (Class<?>[]) null);
- }
- }
-
- } catch (EdmException exp) {
- throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, exp);
- } catch (NoSuchMethodException e1) {
- try {
- EdmSimpleType edmSimpleType = (EdmSimpleType) property.getType();
- if (edmSimpleType == EdmSimpleTypeKind.Boolean.getEdmSimpleTypeInstance()
- && accessModifier.equals("get")) {
- String nameWithIs = getAccessModifierName(property.getName(),
- property.getMapping(), ACCESS_MODIFIER_IS);
- acceserMethod = jpaEntity.getClass().getMethod(nameWithIs, (Class<?>[]) null);
- }
- } catch (EdmException exp) {
- throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, exp);
- } catch (NoSuchMethodException exp) {
- throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, exp);
- } catch (SecurityException exp) {
- throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, exp);
- }
- } catch (SecurityException e1) {
- throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e1);
- }
- if (acceserMethod != null) {
- accessModifierMap.put(
- propertyName,
- acceserMethod);
- }
-
- }
- } catch (EdmException exp) {
- throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, exp);
- }
-
- if (!embeddableKey.isEmpty()) {
- jpaEmbeddableKeyMap.put(jpaEntity.getClass().getName(),
- embeddableKey);
- }
- return accessModifierMap;
+ return getAccessModifiers(getEdmProperties(structuralType), jpaEntity.getClass(), accessModifier);
}
- public static Object getProperty(final Method method, final Object entity) throws ODataJPARuntimeException {
+ public static Object getPropertyValue(final Method method, final Object entity) throws ODataJPARuntimeException {
Object propertyValue = null;
+ if (method == null) {
+ return null;
+ }
try {
+ method.setAccessible(true);
Class<?> returnType = method.getReturnType();
if (returnType.equals(char[].class)) {
@@ -366,6 +254,31 @@ public final class JPAEntityParser {
throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e);
} catch (InvocationTargetException e) {
throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e);
+ } catch (SecurityException e) {
+ throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e);
+ }
+
+ return propertyValue;
+ }
+
+ public Object getEmbeddablePropertyValue(final String methodName, Object jpaEntity) throws ODataJPARuntimeException {
+
+ String[] nameParts = methodName.split("\\.");
+ Object propertyValue = jpaEntity;
+ Method method = null;
+ try {
+ for (String namePart : nameParts) {
+ if (propertyValue == null) {
+ break;
+ }
+ method = propertyValue.getClass().getMethod(namePart, (Class<?>[]) null);
+ method.setAccessible(true);
+ propertyValue = getPropertyValue(method, propertyValue);
+ }
+ } catch (NoSuchMethodException e) {
+ throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e);
+ } catch (SecurityException e) {
+ throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e);
}
return propertyValue;
}
@@ -445,7 +358,7 @@ public final class JPAEntityParser {
}
- public Method getAccessModifier(final Object jpaEntity, final EdmNavigationProperty navigationProperty,
+ public Method getAccessModifier(final Class<?> jpaEntityType, final EdmNavigationProperty navigationProperty,
final String accessModifier)
throws ODataJPARuntimeException {
@@ -467,8 +380,7 @@ public final class JPAEntityParser {
break;
}
}
- return jpaEntity.getClass().getMethod(name,
- params);
+ return jpaEntityType.getMethod(name, params);
} catch (NoSuchMethodException e) {
throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e);
@@ -477,6 +389,89 @@ public final class JPAEntityParser {
} catch (EdmException e) {
throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e);
}
+ }
+
+ private HashMap<String, Method> getAccessModifiers(List<EdmProperty> edmProperties, Class<?> jpaEntityType,
+ String accessModifier) throws ODataJPARuntimeException {
+
+ HashMap<String, Method> accessModifierMap = jpaEntityAccessMap.get(jpaEntityType.getName());
+ if (accessModifierMap == null) {
+ accessModifierMap = new HashMap<String, Method>();
+ jpaEntityAccessMap.put(jpaEntityType.getName(), accessModifierMap);
+ }
+ HashMap<String, String> embeddableKey = jpaEmbeddableKeyMap.get(jpaEntityType.getName());
+ if (embeddableKey == null) {
+ embeddableKey = new HashMap<String, String>();
+ }
+
+ Method method = null;
+ try {
+ for (EdmProperty property : edmProperties) {
+ String propertyName = property.getName();
+ if (accessModifierMap.containsKey(propertyName)) {
+ continue;
+ }
+ String methodName = getAccessModifierName(property.getName(), property.getMapping(), accessModifier);
+ String[] nameParts = methodName.split("\\.");
+ try {
+ if (nameParts.length > 1) {
+ if (!embeddableKey.containsKey(propertyName)) {
+ embeddableKey.put(propertyName, methodName);
+ continue;
+ }
+ } else {
+ if (accessModifier.equals(ACCESS_MODIFIER_SET)) {
+ JPAEdmMapping jpaEdmMapping = (JPAEdmMapping) property.getMapping();
+ accessModifierMap.put(propertyName, jpaEntityType.getMethod(methodName,
+ new Class<?>[] { jpaEdmMapping.getJPAType() }));
+ } else {
+ method = jpaEntityType.getMethod(methodName, (Class<?>[]) null);
+ }
+ }
+ } catch (EdmException exp) {
+ throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, exp);
+ } catch (NoSuchMethodException e1) {
+ try {
+ EdmSimpleType edmSimpleType = (EdmSimpleType) property.getType();
+ if (edmSimpleType == EdmSimpleTypeKind.Boolean.getEdmSimpleTypeInstance()
+ && accessModifier.equals(ACCESS_MODIFIER_GET)) {
+ String nameWithIs = getAccessModifierName(property.getName(),
+ property.getMapping(), ACCESS_MODIFIER_IS);
+ method = jpaEntityType.getMethod(nameWithIs, (Class<?>[]) null);
+ }
+ } catch (EdmException exp) {
+ throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, exp);
+ } catch (NoSuchMethodException exp) {
+ throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, exp);
+ } catch (SecurityException exp) {
+ throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, exp);
+ }
+ } catch (SecurityException e1) {
+ throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e1);
+ }
+ if (method != null) {
+ accessModifierMap.put(propertyName, method);
+ }
+ }
+ } catch (EdmException exp) {
+ throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, exp);
+ }
+ if (!embeddableKey.isEmpty()) {
+ jpaEmbeddableKeyMap.put(jpaEntityType.getName(), embeddableKey);
+ }
+ return accessModifierMap;
+ }
+ private List<EdmProperty> getEdmProperties(EdmStructuralType structuralType) throws ODataJPARuntimeException {
+ List<EdmProperty> edmProperties = new ArrayList<EdmProperty>();
+ try {
+ for (String propertyName : structuralType.getPropertyNames()) {
+ edmProperties.add((EdmProperty) structuralType.getProperty(propertyName));
+ }
+ } catch (EdmException e) {
+ throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e);
+ }
+ return edmProperties;
}
+
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/22164610/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAExpandCallBack.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAExpandCallBack.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAExpandCallBack.java
index 7383081..4bfa743 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAExpandCallBack.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAExpandCallBack.java
@@ -31,6 +31,7 @@ import org.apache.olingo.odata2.api.edm.EdmEntitySet;
import org.apache.olingo.odata2.api.edm.EdmEntityType;
import org.apache.olingo.odata2.api.edm.EdmException;
import org.apache.olingo.odata2.api.edm.EdmNavigationProperty;
+import org.apache.olingo.odata2.api.edm.EdmProperty;
import org.apache.olingo.odata2.api.ep.EntityProviderWriteProperties;
import org.apache.olingo.odata2.api.ep.EntityProviderWriteProperties.ODataEntityProviderPropertiesBuilder;
import org.apache.olingo.odata2.api.ep.callback.OnWriteEntryContent;
@@ -50,6 +51,7 @@ public class JPAExpandCallBack implements OnWriteFeedContent, OnWriteEntryConten
private URI baseUri;
private List<ArrayList<NavigationPropertySegment>> expandList;
private EdmEntitySet nextEntitySet = null;
+ private HashMap<String, List<EdmProperty>> edmPropertyMap = new HashMap<String, List<EdmProperty>>();
private JPAExpandCallBack(final URI baseUri, final List<ArrayList<NavigationPropertySegment>> expandList) {
super();
@@ -97,28 +99,63 @@ public class JPAExpandCallBack implements OnWriteFeedContent, OnWriteEntryConten
return result;
}
+ private List<EdmProperty> getEdmProperties(EdmEntitySet entitySet, ExpandSelectTreeNode expandTreeNode)
+ throws ODataApplicationException {
+
+ try {
+ String name = entitySet.getName();
+ if (edmPropertyMap.containsKey(name)) {
+ return edmPropertyMap.get(name);
+ }
+ List<EdmProperty> edmProperties = new ArrayList<EdmProperty>();
+ edmProperties.addAll(expandTreeNode.getProperties());
+ boolean hit = false;
+ for (EdmProperty keyProperty : entitySet.getEntityType().getKeyProperties()) {
+ hit = false;
+ for (EdmProperty property : edmProperties) {
+ if (property.getName().equals(keyProperty.getName())) {
+ hit = true;
+ break;
+ }
+ }
+ if (hit == false) {
+ edmProperties.add(keyProperty);
+ }
+ }
+ edmPropertyMap.put(name, edmProperties);
+ return edmProperties;
+ } catch (EdmException e) {
+ throw new ODataApplicationException(e.getMessage(), Locale.getDefault(), e);
+ }
+ }
+
@Override
public WriteFeedCallbackResult retrieveFeedResult(final WriteFeedCallbackContext context)
throws ODataApplicationException {
WriteFeedCallbackResult result = new WriteFeedCallbackResult();
HashMap<String, Object> inlinedEntry = (HashMap<String, Object>) context.getEntryData();
List<Map<String, Object>> edmEntityList = new ArrayList<Map<String, Object>>();
- Map<String, Object> edmPropertyValueMap = null;
JPAEntityParser jpaResultParser = new JPAEntityParser();
List<EdmNavigationProperty> currentNavPropertyList = null;
EdmNavigationProperty currentNavigationProperty = context.getNavigationProperty();
+ ExpandSelectTreeNode currentExpandTreeNode = context.getCurrentExpandSelectTreeNode();
+
try {
@SuppressWarnings({ "unchecked" })
Collection<Object> listOfItems = (Collection<Object>) inlinedEntry.get(context.getNavigationProperty().getName());
if (nextEntitySet == null) {
nextEntitySet = context.getSourceEntitySet().getRelatedEntitySet(currentNavigationProperty);
}
- for (Object object : listOfItems) {
- edmPropertyValueMap = jpaResultParser.parse2EdmPropertyValueMap(object, nextEntitySet.getEntityType());
- edmEntityList.add(edmPropertyValueMap);
+ if (currentExpandTreeNode.getProperties().size() > 0) {
+ edmEntityList =
+ jpaResultParser.parse2EdmEntityList(listOfItems, getEdmProperties(nextEntitySet,
+ currentExpandTreeNode));
+ } else {
+ edmEntityList = jpaResultParser.parse2EdmEntityList(listOfItems, nextEntitySet.getEntityType());
}
result.setFeedData(edmEntityList);
- if (context.getCurrentExpandSelectTreeNode().getLinks().size() > 0) {
+
+ if (currentExpandTreeNode.getLinks().size() > 0) {
currentNavPropertyList = new ArrayList<EdmNavigationProperty>();
EdmNavigationProperty nextNavProperty =
getNextNavigationProperty(context.getSourceEntitySet().getEntityType(), context.getNavigationProperty());
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/22164610/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPALink.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPALink.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPALink.java
index 91ac44e..437c057 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPALink.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPALink.java
@@ -154,10 +154,10 @@ public class JPALink {
try {
JPAEntityParser entityParser = new JPAEntityParser();
- Method setMethod = entityParser.getAccessModifier(jpaEntity,
+ Method setMethod = entityParser.getAccessModifier(jpaEntity.getClass(),
targetNavigationProperty, JPAEntityParser.ACCESS_MODIFIER_SET);
- Method getMethod = entityParser.getAccessModifier(jpaEntity,
+ Method getMethod = entityParser.getAccessModifier(jpaEntity.getClass(),
targetNavigationProperty, JPAEntityParser.ACCESS_MODIFIER_GET);
if (getMethod.getReturnType().getTypeParameters() != null
@@ -300,12 +300,12 @@ public class JPALink {
}
try {
JPAEntityParser entityParser = new JPAEntityParser();
- Method setMethod = entityParser.getAccessModifier(sourceJPAEntity,
+ Method setMethod = entityParser.getAccessModifier(sourceJPAEntity.getClass(),
navigationProperty, JPAEntityParser.ACCESS_MODIFIER_SET);
switch (navigationProperty.getMultiplicity()) {
case MANY:
- Method getMethod = entityParser.getAccessModifier(sourceJPAEntity,
+ Method getMethod = entityParser.getAccessModifier(sourceJPAEntity.getClass(),
navigationProperty, JPAEntityParser.ACCESS_MODIFIER_GET);
Collection<Object> relatedEntities = (Collection<Object>) getMethod.invoke(sourceJPAEntity);
relatedEntities.addAll(targetJPAEntities);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/22164610/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParserTest.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParserTest.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParserTest.java
index e1c7c35..01bf774 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParserTest.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParserTest.java
@@ -132,7 +132,7 @@ public class JPAEntityParserTest {
EasyMock.expect(edmTyped.getType()).andStubThrow(
new EdmException(null));
EasyMock.expect(edmTyped.getMapping()).andStubReturn(edmMapping);
- EasyMock.expect(edmTyped.getName()).andReturn("identifier");
+ EasyMock.expect(edmTyped.getName()).andReturn("identifier").anyTimes();
EasyMock.replay(edmTyped);
EasyMock.expect(structuralType.getProperty("identifier"))
.andStubReturn(edmTyped);
@@ -144,7 +144,7 @@ public class JPAEntityParserTest {
EasyMock.expect(edmMapping01.getInternalName()).andStubReturn(
"value");
EasyMock.replay(edmMapping01);
- EasyMock.expect(edmTyped01.getName()).andReturn("value");
+ EasyMock.expect(edmTyped01.getName()).andReturn("value").anyTimes();
EasyMock.expect(edmTyped01.getType()).andStubReturn(edmType01);
EasyMock.expect(edmTyped01.getMapping())
.andStubReturn(edmMapping01);
@@ -204,52 +204,6 @@ public class JPAEntityParserTest {
}
}
- @Test
- public void testparse2EdmPropertyValueMapFromList() {
- JPAEntityParser resultParser = new JPAEntityParser();
- demoItem jpaEntity = new demoItem("laptop", 1);
- DemoRelatedEntity relatedEntity = new DemoRelatedEntity("DemoOrder");
- jpaEntity.setRelatedEntity(relatedEntity);
- List<EdmProperty> selectPropertyList = new ArrayList<EdmProperty>();
- // Mocking EdmProperties
- EdmProperty edmProperty1 = EasyMock.createMock(EdmProperty.class);
- EdmProperty edmProperty2 = EasyMock.createMock(EdmProperty.class);
- EdmType edmType1 = EasyMock.createMock(EdmType.class);
- EdmType edmType2 = EasyMock.createMock(EdmType.class);
- EdmMapping mapping1 = EasyMock.createMock(EdmMapping.class);
- EdmMapping mapping2 = EasyMock.createMock(EdmMapping.class);
- try {
- EasyMock.expect(edmType1.getKind()).andStubReturn(EdmTypeKind.SIMPLE);
- EasyMock.replay(edmType1);
- EasyMock.expect(mapping1.getInternalName()).andStubReturn("id");
- EasyMock.replay(mapping1);
- EasyMock.expect(edmProperty1.getName()).andStubReturn("Id");
- EasyMock.expect(edmProperty1.getMapping()).andStubReturn(mapping1);
- EasyMock.expect(edmProperty1.getType()).andStubReturn(edmType1);
- EasyMock.replay(edmProperty1);
- EasyMock.expect(edmType2.getKind()).andStubReturn(EdmTypeKind.COMPLEX);
- EasyMock.replay(edmType2);
- EasyMock.expect(mapping2.getInternalName()).andStubReturn("relatedEntity.order");
- EasyMock.replay(mapping2);
- EasyMock.expect(edmProperty2.getName()).andStubReturn("Order");
- EasyMock.expect(edmProperty2.getMapping()).andStubReturn(mapping2);
- EasyMock.expect(edmProperty2.getType()).andStubReturn(edmType2);
- EasyMock.replay(edmProperty2);
-
- } catch (EdmException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- }
- selectPropertyList.add(edmProperty1);
- selectPropertyList.add(edmProperty2);
- try {
- Map<String, Object> result = resultParser.parse2EdmPropertyValueMap(jpaEntity, selectPropertyList);
- assertEquals("DemoOrder", result.get("Order"));
- } catch (ODataJPARuntimeException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- }
-
- }
-
// This unit tests when there is a complex type in the select list
@SuppressWarnings("unchecked")
@Test
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/22164610/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParserTestForStaticMethods.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParserTestForStaticMethods.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParserTestForStaticMethods.java
index e75b060..22bac6c 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParserTestForStaticMethods.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParserTestForStaticMethods.java
@@ -73,7 +73,7 @@ public class JPAEntityParserTestForStaticMethods {
public void testGetPropertyCharacter() {
try {
Method method = JPAEntityParserTestForStaticMethods.class.getMethod("getCharacter", (Class<?>[]) null);
- String output = (String) JPAEntityParser.getProperty(method, this);
+ String output = (String) JPAEntityParser.getPropertyValue(method, this);
assertEquals("A", output);
} catch (NoSuchMethodException e) {
@@ -89,7 +89,7 @@ public class JPAEntityParserTestForStaticMethods {
public void testGetPropertyCharacterNull() {
try {
Method method = JPAEntityParserTestForStaticMethods.class.getMethod("getCharacterNull", (Class<?>[]) null);
- String output = (String) JPAEntityParser.getProperty(method, this);
+ String output = (String) JPAEntityParser.getPropertyValue(method, this);
assertNull(output);
} catch (NoSuchMethodException e) {
@@ -105,7 +105,7 @@ public class JPAEntityParserTestForStaticMethods {
public void testGetPropertyCharacterArray() {
try {
Method method = JPAEntityParserTestForStaticMethods.class.getMethod("getCharacterArray", (Class<?>[]) null);
- String output = (String) JPAEntityParser.getProperty(method, this);
+ String output = (String) JPAEntityParser.getPropertyValue(method, this);
assertEquals("AB", output);
} catch (NoSuchMethodException e) {
@@ -121,7 +121,7 @@ public class JPAEntityParserTestForStaticMethods {
public void testGetPropertyCharacterArrayNull() {
try {
Method method = JPAEntityParserTestForStaticMethods.class.getMethod("getCharacterArrayNull", (Class<?>[]) null);
- String output = (String) JPAEntityParser.getProperty(method, this);
+ String output = (String) JPAEntityParser.getPropertyValue(method, this);
assertNull(output);
} catch (NoSuchMethodException e) {
@@ -137,7 +137,7 @@ public class JPAEntityParserTestForStaticMethods {
public void testGetPropertyChar() {
try {
Method method = JPAEntityParserTestForStaticMethods.class.getMethod("getChar", (Class<?>[]) null);
- String output = (String) JPAEntityParser.getProperty(method, this);
+ String output = (String) JPAEntityParser.getPropertyValue(method, this);
assertEquals("A", output);
} catch (NoSuchMethodException e) {
@@ -153,7 +153,7 @@ public class JPAEntityParserTestForStaticMethods {
public void testGetPropertyCharNull() {
try {
Method method = JPAEntityParserTestForStaticMethods.class.getMethod("getCharNull", (Class<?>[]) null);
- String output = (String) JPAEntityParser.getProperty(method, this);
+ String output = (String) JPAEntityParser.getPropertyValue(method, this);
assertNull(output);
} catch (NoSuchMethodException e) {
@@ -169,7 +169,7 @@ public class JPAEntityParserTestForStaticMethods {
public void testGetPropertyCharArray() {
try {
Method method = JPAEntityParserTestForStaticMethods.class.getMethod("getCharArray", (Class<?>[]) null);
- String output = (String) JPAEntityParser.getProperty(method, this);
+ String output = (String) JPAEntityParser.getPropertyValue(method, this);
assertEquals("AB", output);
} catch (NoSuchMethodException e) {
@@ -185,7 +185,7 @@ public class JPAEntityParserTestForStaticMethods {
public void testGetPropertyCharArrayNull() {
try {
Method method = JPAEntityParserTestForStaticMethods.class.getMethod("getCharArrayNull", (Class<?>[]) null);
- String output = (String) JPAEntityParser.getProperty(method, this);
+ String output = (String) JPAEntityParser.getPropertyValue(method, this);
assertNull(output);
} catch (NoSuchMethodException e) {
@@ -201,7 +201,7 @@ public class JPAEntityParserTestForStaticMethods {
public void testGetPropertyCharArrayValueNull() {
try {
Method method = JPAEntityParserTestForStaticMethods.class.getMethod("getCharArrayValueNull", (Class<?>[]) null);
- String output = (String) JPAEntityParser.getProperty(method, this);
+ String output = (String) JPAEntityParser.getPropertyValue(method, this);
assertEquals("A\u0000", output);
} catch (NoSuchMethodException e) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/22164610/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/data/EdmMockUtil.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/data/EdmMockUtil.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/data/EdmMockUtil.java
index e525ffd..632a299 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/data/EdmMockUtil.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/data/EdmMockUtil.java
@@ -55,6 +55,9 @@ public class EdmMockUtil {
Map<String, ExpandSelectTreeNode> links = new HashMap<String, ExpandSelectTreeNode>();
links.put("SalesOrderLineItemDetails", nextExpandNode);
EasyMock.expect(expandNode.getLinks()).andStubReturn(links);
+ List<EdmProperty> edmPropertyList = new ArrayList<EdmProperty>();
+ edmPropertyList.add(mockEdmPropertyOfTarget());
+ EasyMock.expect(expandNode.getProperties()).andReturn(edmPropertyList).anyTimes();
EasyMock.replay(expandNode);
return expandNode;
}
@@ -63,6 +66,9 @@ public class EdmMockUtil {
ExpandSelectTreeNode expandNode = EasyMock.createMock(ExpandSelectTreeNode.class);
Map<String, ExpandSelectTreeNode> links = new HashMap<String, ExpandSelectTreeNode>();
EasyMock.expect(expandNode.getLinks()).andStubReturn(links);
+ List<EdmProperty> edmPropertyList = new ArrayList<EdmProperty>();
+ edmPropertyList.add(mockEdmPropertyOfTarget());
+ EasyMock.expect(expandNode.getProperties()).andReturn(edmPropertyList).anyTimes();
EasyMock.replay(expandNode);
return expandNode;
}
@@ -85,7 +91,6 @@ public class EdmMockUtil {
writeContext.setNavigationProperty(mockNavigationProperty());
writeContext.setSourceEntitySet(mockSourceEntitySet());
writeContext.setEntryData(getFeedData());
-
} catch (URISyntaxException e) {
fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
}
@@ -132,7 +137,9 @@ public class EdmMockUtil {
EasyMock.expect(entityType.getProperty("id")).andStubReturn(property1);
EasyMock.expect(entityType.getProperty("description")).andStubReturn(mockEdmPropertyOfSource2());
EasyMock.expect(entityType.getPropertyNames()).andStubReturn(propertyNames);
-
+ List<EdmProperty> keyProperties = new ArrayList<EdmProperty>();
+ keyProperties.add(property1);
+ EasyMock.expect(entityType.getKeyProperties()).andStubReturn(keyProperties);
} catch (EdmException e) {
fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
}
@@ -234,6 +241,7 @@ public class EdmMockUtil {
EdmEntitySet entitySet = EasyMock.createMock(EdmEntitySet.class);
try {
EasyMock.expect(entitySet.getEntityType()).andStubReturn(mockTargetEdmEntityType());
+ EasyMock.expect(entitySet.getName()).andStubReturn("SalesOrderLineItems");
} catch (EdmException e) {
fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
}
@@ -289,6 +297,10 @@ public class EdmMockUtil {
EdmProperty property = mockEdmPropertyOfTarget();
EasyMock.expect(entityType.getProperty("price")).andStubReturn(property);
EasyMock.expect(entityType.getPropertyNames()).andStubReturn(propertyNames);
+
+ List<EdmProperty> keyProperties = new ArrayList<EdmProperty>();
+ keyProperties.add(property);
+ EasyMock.expect(entityType.getKeyProperties()).andStubReturn(keyProperties);
} catch (EdmException e) {
fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
[08/14] git commit: [OLINGO-71] Set next release candidate version
RC02
Posted by sk...@apache.org. [OLINGO-71] Set next release candidate version RC02
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/commit/2ec7e208
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/2ec7e208
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/2ec7e208
Branch: refs/heads/olingo-117
Commit: 2ec7e208c35129b22644b6b702b5c42eda11f03b
Parents: b88fc59
Author: Christian Amend <ch...@apache.org>
Authored: Tue Jan 21 16:14:04 2014 +0100
Committer: Christian Amend <ch...@apache.org>
Committed: Tue Jan 21 16:14:04 2014 +0100
----------------------------------------------------------------------
odata2-annotation-processor/annotation-processor-api/pom.xml | 2 +-
odata2-annotation-processor/annotation-processor-core/pom.xml | 2 +-
odata2-annotation-processor/annotation-processor-ref/pom.xml | 2 +-
odata2-annotation-processor/annotation-processor-web/pom.xml | 2 +-
odata2-annotation-processor/pom.xml | 2 +-
odata2-dist/janos/pom.xml | 2 +-
odata2-dist/javadoc/pom.xml | 2 +-
odata2-dist/jpa/pom.xml | 2 +-
odata2-dist/lib/pom.xml | 2 +-
odata2-dist/pom.xml | 2 +-
odata2-dist/ref/pom.xml | 2 +-
odata2-jpa-processor/jpa-api/pom.xml | 2 +-
odata2-jpa-processor/jpa-core/pom.xml | 2 +-
odata2-jpa-processor/jpa-ref/pom.xml | 2 +-
odata2-jpa-processor/jpa-web/pom.xml | 2 +-
odata2-jpa-processor/pom.xml | 2 +-
odata2-lib/odata-annotation/pom.xml | 2 +-
odata2-lib/odata-api/pom.xml | 2 +-
odata2-lib/odata-core/pom.xml | 2 +-
odata2-lib/odata-fit/pom.xml | 2 +-
odata2-lib/odata-ref/pom.xml | 2 +-
odata2-lib/odata-testutil/pom.xml | 2 +-
odata2-lib/odata-web/pom.xml | 2 +-
odata2-lib/pom.xml | 2 +-
odata2-sample/cars-annotation-archetype/pom.xml | 4 ++--
odata2-sample/cars-service-archetype/pom.xml | 4 ++--
odata2-sample/pom.xml | 2 +-
pom.xml | 2 +-
28 files changed, 30 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2ec7e208/odata2-annotation-processor/annotation-processor-api/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-api/pom.xml b/odata2-annotation-processor/annotation-processor-api/pom.xml
index 0182f33..af1f50b 100644
--- a/odata2-annotation-processor/annotation-processor-api/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-api/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-annotation-processor-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC02</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2ec7e208/odata2-annotation-processor/annotation-processor-core/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/pom.xml b/odata2-annotation-processor/annotation-processor-core/pom.xml
index 8ed093e..4df6246 100644
--- a/odata2-annotation-processor/annotation-processor-core/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-core/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-annotation-processor-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC02</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2ec7e208/odata2-annotation-processor/annotation-processor-ref/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-ref/pom.xml b/odata2-annotation-processor/annotation-processor-ref/pom.xml
index 4614af0..8b74ce7 100644
--- a/odata2-annotation-processor/annotation-processor-ref/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-ref/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-annotation-processor-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC02</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2ec7e208/odata2-annotation-processor/annotation-processor-web/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-web/pom.xml b/odata2-annotation-processor/annotation-processor-web/pom.xml
index 5df9a18..221b5f0 100644
--- a/odata2-annotation-processor/annotation-processor-web/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-web/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-annotation-processor-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC02</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2ec7e208/odata2-annotation-processor/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/pom.xml b/odata2-annotation-processor/pom.xml
index 776a515..90471e8 100644
--- a/odata2-annotation-processor/pom.xml
+++ b/odata2-annotation-processor/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC02</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2ec7e208/odata2-dist/janos/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/janos/pom.xml b/odata2-dist/janos/pom.xml
index f6a3f81..73e98a9 100644
--- a/odata2-dist/janos/pom.xml
+++ b/odata2-dist/janos/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-dist-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC02</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2ec7e208/odata2-dist/javadoc/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/javadoc/pom.xml b/odata2-dist/javadoc/pom.xml
index 970e018..cd5f511 100644
--- a/odata2-dist/javadoc/pom.xml
+++ b/odata2-dist/javadoc/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-dist-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC02</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2ec7e208/odata2-dist/jpa/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/jpa/pom.xml b/odata2-dist/jpa/pom.xml
index c026647..8a4173f 100644
--- a/odata2-dist/jpa/pom.xml
+++ b/odata2-dist/jpa/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-dist-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC02</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2ec7e208/odata2-dist/lib/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/lib/pom.xml b/odata2-dist/lib/pom.xml
index 54b82aa..42da502 100644
--- a/odata2-dist/lib/pom.xml
+++ b/odata2-dist/lib/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-dist-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC02</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2ec7e208/odata2-dist/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/pom.xml b/odata2-dist/pom.xml
index 42f9705..ac9efea 100644
--- a/odata2-dist/pom.xml
+++ b/odata2-dist/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC02</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2ec7e208/odata2-dist/ref/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/ref/pom.xml b/odata2-dist/ref/pom.xml
index f6c0a42..9f5610f 100644
--- a/odata2-dist/ref/pom.xml
+++ b/odata2-dist/ref/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-dist-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC02</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2ec7e208/odata2-jpa-processor/jpa-api/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-api/pom.xml b/odata2-jpa-processor/jpa-api/pom.xml
index e987876..8e591e8 100644
--- a/odata2-jpa-processor/jpa-api/pom.xml
+++ b/odata2-jpa-processor/jpa-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-jpa-processor-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC02</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2ec7e208/odata2-jpa-processor/jpa-core/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/pom.xml b/odata2-jpa-processor/jpa-core/pom.xml
index c9d1d2c..94739df 100644
--- a/odata2-jpa-processor/jpa-core/pom.xml
+++ b/odata2-jpa-processor/jpa-core/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-jpa-processor-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC02</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2ec7e208/odata2-jpa-processor/jpa-ref/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-ref/pom.xml b/odata2-jpa-processor/jpa-ref/pom.xml
index a44b7f1..78228e9 100644
--- a/odata2-jpa-processor/jpa-ref/pom.xml
+++ b/odata2-jpa-processor/jpa-ref/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-jpa-processor-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC02</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2ec7e208/odata2-jpa-processor/jpa-web/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-web/pom.xml b/odata2-jpa-processor/jpa-web/pom.xml
index 00fabf2..c6df159 100644
--- a/odata2-jpa-processor/jpa-web/pom.xml
+++ b/odata2-jpa-processor/jpa-web/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-jpa-processor-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC02</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2ec7e208/odata2-jpa-processor/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/pom.xml b/odata2-jpa-processor/pom.xml
index c90be6f..10e187a 100644
--- a/odata2-jpa-processor/pom.xml
+++ b/odata2-jpa-processor/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC02</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2ec7e208/odata2-lib/odata-annotation/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-annotation/pom.xml b/odata2-lib/odata-annotation/pom.xml
index 650bd49..5706c64 100644
--- a/odata2-lib/odata-annotation/pom.xml
+++ b/odata2-lib/odata-annotation/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC02</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2ec7e208/odata2-lib/odata-api/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-api/pom.xml b/odata2-lib/odata-api/pom.xml
index 8b5a7d6..4a94994 100644
--- a/odata2-lib/odata-api/pom.xml
+++ b/odata2-lib/odata-api/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC02</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2ec7e208/odata2-lib/odata-core/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/pom.xml b/odata2-lib/odata-core/pom.xml
index 0151902..74dc38c 100644
--- a/odata2-lib/odata-core/pom.xml
+++ b/odata2-lib/odata-core/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC02</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2ec7e208/odata2-lib/odata-fit/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/pom.xml b/odata2-lib/odata-fit/pom.xml
index b3ea798..3570952 100644
--- a/odata2-lib/odata-fit/pom.xml
+++ b/odata2-lib/odata-fit/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC02</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2ec7e208/odata2-lib/odata-ref/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-ref/pom.xml b/odata2-lib/odata-ref/pom.xml
index 4727dba..0e06702 100644
--- a/odata2-lib/odata-ref/pom.xml
+++ b/odata2-lib/odata-ref/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC02</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2ec7e208/odata2-lib/odata-testutil/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-testutil/pom.xml b/odata2-lib/odata-testutil/pom.xml
index 28f4f36..6cff762 100644
--- a/odata2-lib/odata-testutil/pom.xml
+++ b/odata2-lib/odata-testutil/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC02</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2ec7e208/odata2-lib/odata-web/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-web/pom.xml b/odata2-lib/odata-web/pom.xml
index 1dab758..1d0431f 100644
--- a/odata2-lib/odata-web/pom.xml
+++ b/odata2-lib/odata-web/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC02</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2ec7e208/odata2-lib/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-lib/pom.xml b/odata2-lib/pom.xml
index be175b3..d3adeea 100644
--- a/odata2-lib/pom.xml
+++ b/odata2-lib/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC02</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2ec7e208/odata2-sample/cars-annotation-archetype/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-sample/cars-annotation-archetype/pom.xml b/odata2-sample/cars-annotation-archetype/pom.xml
index 459a1bf..0b67db9 100644
--- a/odata2-sample/cars-annotation-archetype/pom.xml
+++ b/odata2-sample/cars-annotation-archetype/pom.xml
@@ -16,13 +16,13 @@
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-sample-cars-annotation-archetype-incubating</artifactId>
<name>${project.artifactId}</name>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC02</version>
<packaging>maven-archetype</packaging>
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-sample-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC02</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2ec7e208/odata2-sample/cars-service-archetype/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-sample/cars-service-archetype/pom.xml b/odata2-sample/cars-service-archetype/pom.xml
index 68fb11e..beac7af 100644
--- a/odata2-sample/cars-service-archetype/pom.xml
+++ b/odata2-sample/cars-service-archetype/pom.xml
@@ -24,14 +24,14 @@
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-sample-cars-service-archetype-incubating</artifactId>
<name>${project.artifactId}</name>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC02</version>
<packaging>maven-archetype</packaging>
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-sample-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC02</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2ec7e208/odata2-sample/pom.xml
----------------------------------------------------------------------
diff --git a/odata2-sample/pom.xml b/odata2-sample/pom.xml
index 82a897c..ac44f46 100644
--- a/odata2-sample/pom.xml
+++ b/odata2-sample/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC02</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2ec7e208/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 57de237..9442279 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent-incubating</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.1.0-RC02</version>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
[05/14] git commit: [OLINGO-130] fix
Posted by sk...@apache.org. [OLINGO-130] fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/commit/d86ec45b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/d86ec45b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/d86ec45b
Branch: refs/heads/olingo-117
Commit: d86ec45be15bc8ae5d1d569898d502a91ddc302e
Parents: 2216461
Author: Stephan Klevenz <sk...@apache.org>
Authored: Tue Jan 21 13:36:28 2014 +0100
Committer: Stephan Klevenz <sk...@apache.org>
Committed: Tue Jan 21 13:36:28 2014 +0100
----------------------------------------------------------------------
.../lib/src/main/assembly/lib-assembly.xml | 4 +--
.../ref/src/main/assembly/ref-assembly.xml | 2 +-
pom.xml | 32 +++++++++++++-------
3 files changed, 23 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d86ec45b/odata2-dist/lib/src/main/assembly/lib-assembly.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/lib/src/main/assembly/lib-assembly.xml b/odata2-dist/lib/src/main/assembly/lib-assembly.xml
index 1bd91a9..115107c 100644
--- a/odata2-dist/lib/src/main/assembly/lib-assembly.xml
+++ b/odata2-dist/lib/src/main/assembly/lib-assembly.xml
@@ -25,10 +25,8 @@
<includes>
<include>org.apache.olingo:olingo-odata2-core-incubating</include>
<include>org.apache.olingo:olingo-odata2-api-incubating</include>
+ <include>org.apache.olingo:olingo-odata2-api-annotation-incubating</include>
</includes>
- <excludes>
- <exclude>org.apache.olingo:olingo-odata2-api-annotation-incubating</exclude>
- </excludes>
</dependencySet>
</dependencySets>
<fileSets>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d86ec45b/odata2-dist/ref/src/main/assembly/ref-assembly.xml
----------------------------------------------------------------------
diff --git a/odata2-dist/ref/src/main/assembly/ref-assembly.xml b/odata2-dist/ref/src/main/assembly/ref-assembly.xml
index 2409375..ce6f906 100644
--- a/odata2-dist/ref/src/main/assembly/ref-assembly.xml
+++ b/odata2-dist/ref/src/main/assembly/ref-assembly.xml
@@ -27,7 +27,7 @@
</fileSet>
<fileSet>
<outputDirectory>/</outputDirectory>
- <directory>${basedir}/../../odata2-processor-jpa/jpa-web/target/</directory>
+ <directory>${basedir}/../../odata2-jpa-processor/jpa-web/target/</directory>
<includes>
<include>**/*.war</include>
</includes>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/d86ec45b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3ac43ed..57de237 100644
--- a/pom.xml
+++ b/pom.xml
@@ -154,7 +154,7 @@
<artifactId>maven-war-plugin</artifactId>
<version>2.4</version>
</plugin>
- </plugins>
+ </plugins>
</pluginManagement>
<plugins>
<plugin>
@@ -359,7 +359,9 @@
<head>Do not implement this interface or derive from class.</head>
</tag>
</tags>
- <excludePackageNames>org.apache.olingo.odata2.core:org.apache.olingo.odata2.core.*:org.apache.olingo.odata2.processor.core:org.apache.olingo.odata2.processor.core.*:org.apache.olingo.odata2.testutil:org.apache.olingo.odata2.testutil.*</excludePackageNames>
+ <excludePackageNames>
+ org.apache.olingo.odata2.core:org.apache.olingo.odata2.core.*:org.apache.olingo.odata2.jpa.processor.core:org.apache.olingo.odata2.jpa.processor.core.*:org.apache.olingo.odata2.annotation.processor.core:org.apache.olingo.odata2.annotation.processor.core.*:org.apache.olingo.odata2.testutil:org.apache.olingo.odata2.testutil.*
+ </excludePackageNames>
<additionalJOptions>
<additionalJOption>-quiet</additionalJOption>
</additionalJOptions>
@@ -374,12 +376,20 @@
</group>
<group>
<title>OData JPA Processor</title>
- <packages>org.apache.olingo.odata2.processor.api:org.apache.olingo.odata2.processor.api.*</packages>
+ <packages>org.apache.olingo.odata2.jpa.processor.api:org.apache.olingo.odata2.jpa.processor.api.*</packages>
+ </group>
+ <group>
+ <title>OData Annotation Processor</title>
+ <packages>org.apache.olingo.odata2.annotation.processor.api:org.apache.olingo.odata2.annotation.processor.api.*</packages>
</group>
<group>
<title>OData JPA Reference Scenario</title>
<packages>org.apache.olingo.odata2.jpa.processor.ref:org.apache.olingo.odata2.jpa.processor.ref.*</packages>
</group>
+ <group>
+ <title>OData Annotation Reference Scenario</title>
+ <packages>org.apache.olingo.odata2.annotation.processor.ref:org.apache.olingo.odata2.annotation.processor.ref.*</packages>
+ </group>
</groups>
</configuration>
</execution>
@@ -389,14 +399,14 @@
</build>
</profile>
</profiles>
-
- <repositories>
- <repository>
- <id>oss.sonatype.org</id>
- <name>OSS Sonatype Staging</name>
- <url>https://oss.sonatype.org/content/groups/staging</url>
- </repository>
- </repositories>
+
+ <repositories>
+ <repository>
+ <id>oss.sonatype.org</id>
+ <name>OSS Sonatype Staging</name>
+ <url>https://oss.sonatype.org/content/groups/staging</url>
+ </repository>
+ </repositories>
<dependencies>
<dependency>