[OLINGO-52] expand collection issue - Set support

• Type: Bug
• Status: Closed
• Priority: Minor
• Resolution: Fixed
• Affects Version/s: V2 1.1.0
• Fix Version/s: V2 1.1.0
• Component/s: odata2-jpa
• Labels: JPA collections expand
• Environment: Hibernate
• Assignee: Chandan V.A
• Reporter: Carl J. Mosca
• Created: 30/Oct/13 13:06
• Updated: 10/Feb/14 15:16
• Resolved: 04/Dec/13 05:28

Description

We have a model which employs Sets. The JPAExpandCallback seems to be expecting Lists for collections.

The newly discovered "odata-debug" made finding this issue very easy.

A diff of the code changes for a quick fix are below. Because I ran into this previously elsewhere, I wonder if a cleaner way to handle the collections has already been added somewhere in the code base.

@@ -100,8 +104,13 @@
List<EdmNavigationProperty> currentNavPropertyList = null;
EdmNavigationProperty currentNavigationProperty = context.getNavigationProperty();
try {

• @SuppressWarnings( { "unchecked" }

  )

• List<Object> listOfItems = (List<Object>) inlinedEntry.get(context.getNavigationProperty().getName());
  + List<Object> listOfItems = null;
  + if (inlinedEntry.get(context.getNavigationProperty().getName()) instanceof Set) { + listOfItems = new ArrayList<Object>(); + listOfItems.addAll((Set) inlinedEntry.get(context.getNavigationProperty().getName())); + }

  else

  { + listOfItems = (List<Object>) inlinedEntry.get(context.getNavigationProperty().getName()); + }

  if (nextEntitySet == null)

  { nextEntitySet = context.getSourceEntitySet().getRelatedEntitySet(currentNavigationProperty); }