[Enhancement #43] Order attributes for serialization so that object p…

…roperty values are processed last to prevent issues with context building.

src/main/java/cz/cvut/kbss/jsonld/common/BeanAnnotationProcessor.java

@@ -213,7 +213,10 @@ private static List<Field> getMarshallableFields(Class<?> cls, Predicate<Field>
                 }
             }
         }
-        return new ArrayList<>(fields);
+        final List<Field> result = new ArrayList<>(fields);
+        // Move object properties to the end
+        result.sort(Comparator.comparing(BeanAnnotationProcessor::isObjectProperty));
+        return result;
     }
 
     /**

src/test/java/cz/cvut/kbss/jsonld/serialization/ContextBuildingJsonLdSerializerTest.java

@@ -231,12 +231,9 @@ void serializationCreatesEmbeddedContextToOverrideIncompatibleTermMapping() thro
         assertInstanceOf(Map.class, json.get(JsonLd.CONTEXT));
         final Map<String, ?> context = (Map<String, JsonNode>) json.get(JsonLd.CONTEXT);
         assertEquals(DC.Terms.TITLE, context.get("name"));
-        assertThat(json, hasKey(JsonLd.GRAPH));
-        assertInstanceOf(Map.class, json.get(JsonLd.GRAPH));
-        final Map<String, ?> study = (Map<String, JsonNode>) json.get(JsonLd.GRAPH);
-        assertThat(study, hasKey("organization"));
-        assertInstanceOf(Map.class, study.get("organization"));
-        final Map<String, ?> organization = (Map<String, ?>) study.get("organization");
+        assertThat(json, hasKey("organization"));
+        assertInstanceOf(Map.class, json.get("organization"));
+        final Map<String, ?> organization = (Map<String, ?>) json.get("organization");
         assertThat(organization, hasKey(JsonLd.CONTEXT));
         assertInstanceOf(Map.class, organization.get(JsonLd.CONTEXT));
         final Map<String, ?> embeddedCtx = (Map<String, ?>) organization.get(JsonLd.CONTEXT);