Model Documentation Generation

.licenserc.yaml

@@ -54,5 +54,6 @@ header:
     - 'gradlew'
     - 'gradlew.bat'
     - 'settings.gradle'
+    - '**/*Test.java'
 
   comment: always

cnf/build.bnd

@@ -25,7 +25,7 @@ base-version: 1.0.0.SNAPSHOT
 javac.source: 11
 javac.target: 11
 
--require-bnd "(version>=6.2.0)"
+-require-bnd "(version>=6.3.1)"
 
 -plugin.Central: \
     aQute.bnd.repository.maven.provider.MavenBndRepository; \

cnf/central.mvn

@@ -130,9 +130,9 @@ org.osgi:osgi.core:8.0.0
 org.slf4j:slf4j-api:1.7.30
 org.slf4j:slf4j-simple:1.7.30
 
-org.eclipse.emf:org.eclipse.emf.common:2.23.0
-org.eclipse.emf:org.eclipse.emf.ecore:2.25.0
-org.eclipse.emf:org.eclipse.emf.ecore.xmi:2.16.0
+#org.eclipse.emf:org.eclipse.emf.common:2.23.0
+#org.eclipse.emf:org.eclipse.emf.ecore:2.25.0
+#org.eclipse.emf:org.eclipse.emf.ecore.xmi:2.16.0
 org.eclipse.emf:org.eclipse.emf.codegen.ecore:2.28.0
 org.eclipse.emf:org.eclipse.emf.codegen:2.22.0
 org.eclipse.emf:org.eclipse.emf.ecore.xcore.lib:1.6.0
@@ -157,14 +157,23 @@ org.geckoprojects.bnd:org.gecko.bnd.jacoco.library:1.1.1
 
 #org.geckoprojects.emf:org.gecko.emf.osgi.api:4.1.1.202202162308
 org.geckoprojects.emf:org.gecko.emf.osgi.bnd.library.workspace:4.1.1-SNAPSHOT
-org.geckoprojects.emf:org.gecko.emf.osgi.example.model.basic:4.1.1-SNAPSHOT
 
 com.fasterxml.jackson.core:jackson-core:2.13.2
 com.fasterxml.jackson.core:jackson-databind:2.13.2
 com.fasterxml.jackson.core:jackson-annotations:2.13.2
 com.fasterxml.jackson.dataformat:jackson-dataformat-properties:2.13.2
 com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.2
-org.eclipse.emfcloud:emfjson-jackson:2.1.0-SNAPSHOT
+org.eclipse.emfcloud:emfjson-jackson:2.1.0
 de.undercouch:bson4jackson:2.13.1
 org.yaml:snakeyaml:1.30
 #org.emfjson:emfjson-jackson:1.3.0
+org.geckoprojects.emf:org.gecko.emf.osgi.example.model.basic:4.1.1.202202162309
+
+
+#xtext
+org.eclipse.xtext:org.eclipse.xtext.xbase.lib:2.29.0.M1
+org.eclipse.xtext:org.eclipse.xtext.builder:2.10.0
+com.google.guava:guava:30.1-jre
+com.google.guava:failureaccess:1.0.1
+
+org.gecko.runtime:org.gecko.templates:1.0.31

gradle.properties

@@ -1,2 +1,2 @@
-bnd_version=6.3.0-RC1
+bnd_version=6.3.1
 bnd_snapshots=https://bndtools.jfrog.io/ui/native/libs-release/

org.gecko.emf.bson/src/org/gecko/emf/bson/EMFBsonResourceFactoryConfigurator.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2012 - 2022 Data In Motion and others.
  * All rights reserved. 
  * 

org.gecko.emf.bson/src/org/gecko/emf/bson/annotation/RequireEMFBson.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2012 - 2022 Data In Motion and others.
  * All rights reserved. 
  * 

org.gecko.emf.bson/src/org/gecko/emf/bson/handler/BsonDateProblemHandler.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2012 - 2022 Data In Motion and others.
  * All rights reserved. 
  * 

org.gecko.emf.json.tests/bnd.bnd

@@ -6,4 +6,8 @@ javac.target: 11
 
 Bundle-Version: 1.0.1.SNAPSHOT
 -buildpath: \
-	org.eclipse.emfcloud.emfjson-jackson;version=latest
+	org.eclipse.emfcloud.emfjson-jackson;version=latest,\
+	org.gecko.emf.osgi.component,\
+	org.eclipse.emf.ecore.xmi,\
+	org.eclipse.emf.ecore,\
+	org.gecko.emf.osgi.example.model.basic

org.gecko.emf.json.tests/src/org/gecko/emf/json/tests/RootElementTest.java

@@ -0,0 +1,124 @@
+/**
+ * Copyright (c) 2012 - 2022 Data In Motion and others.
+ * All rights reserved. 
+ * 
+ * This program and the accompanying materials are made available under the terms of the 
+ * Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ * 
+ * Contributors:
+ *     Data In Motion - initial API and implementation
+ */
+package org.gecko.emf.json.tests;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.gecko.emf.json.configuration.ConfigurableJsonResource;
+import org.gecko.emf.json.configuration.ConfigurableJsonResourceFactory;
+import org.gecko.emf.json.constants.EMFJs;
+import org.gecko.emf.osgi.example.model.basic.BasicFactory;
+import org.gecko.emf.osgi.example.model.basic.BasicPackage;
+import org.gecko.emf.osgi.example.model.basic.Person;
+import org.gecko.emf.osgi.example.model.basic.impl.BasicPackageImpl;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+/**
+ * 
+ * @author mark
+ * @since 15.07.2022
+ */
+public class RootElementTest {
+
+	private ResourceSetImpl resourceSet;
+	private BasicPackage packageImpl;
+	private BasicFactory factoryImpl;
+
+	@BeforeEach
+	public void beforeEach() {
+		resourceSet = new ResourceSetImpl();
+		resourceSet.getPackageRegistry().put(EcorePackage.eNS_URI, EcorePackage.eINSTANCE);
+		packageImpl = BasicPackageImpl.init();
+		factoryImpl = BasicFactory.eINSTANCE;
+		resourceSet.getPackageRegistry().put(BasicPackage.eNS_URI, packageImpl);
+		resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("json", new ConfigurableJsonResourceFactory());
+	}
+
+	@Test
+	public void testSaveJson() {
+		Resource resource = resourceSet.createResource(URI.createURI("test.json"));
+		assertNotNull(resource);
+		assertTrue(resource instanceof ConfigurableJsonResource);
+
+		Person p = factoryImpl.createPerson();
+		p.setFirstName("Emil");
+		p.setLastName("Tester");
+		resource.getContents().add(p);
+
+		ByteArrayOutputStream baos = new ByteArrayOutputStream();
+		try {
+			resource.save(baos, null);
+		} catch (IOException e) {
+			fail("Error saving Person");
+		}
+		String result = new String(baos.toByteArray());
+		System.out.println(result);
+	}
+
+	@Test
+	public void testLoadJsonError() {
+		String json = "{\n"
+				+ "  \"firstName\" : \"Emil\",\n"
+				+ "  \"lastName\" : \"Tester\"\n"
+				+ "}";
+		Resource loadResource = resourceSet.createResource(URI.createURI("test-load-error.json"));
+		assertNotNull(loadResource);
+		assertTrue(loadResource instanceof ConfigurableJsonResource);
+
+		ByteArrayInputStream bais = new ByteArrayInputStream(json.getBytes());
+		try {
+			loadResource.load(bais, null);
+			assertEquals(0, loadResource.getContents().size());
+		} catch (IOException e) {
+			fail("Error loading Person");
+		}
+	}
+
+	@Test
+	public void testLoadJson() {
+		String json = "{\n"
+				+ "  \"firstName\" : \"Emil\",\n"
+				+ "  \"lastName\" : \"Tester\"\n"
+				+ "}";
+		Resource loadResource = resourceSet.createResource(URI.createURI("test-load.json"));
+		assertNotNull(loadResource);
+		assertTrue(loadResource instanceof ConfigurableJsonResource);
+
+		ByteArrayInputStream bais = new ByteArrayInputStream(json.getBytes());
+		try {
+			Map<String, Object> loadOptions = new HashMap<String, Object>();
+			loadOptions.put(EMFJs.OPTION_ROOT_ELEMENT, packageImpl.getPerson());
+			loadResource.load(bais, loadOptions);
+			assertEquals(1, loadResource.getContents().size());
+			Person p = (Person) loadResource.getContents().get(0);
+			assertEquals("Emil", p.getFirstName());
+			assertEquals("Tester", p.getLastName());
+		} catch (IOException e) {
+			fail("Error loading Person");
+		}
+	}
+
+}

org.gecko.emf.json.tests/test.bndrun

@@ -12,7 +12,6 @@
 	com.fasterxml.jackson.dataformat.jackson-dataformat-properties;version='[2.13.2,2.13.3)',\
 	com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.13.2,2.13.3)',\
 	de.undercouch.bson4jackson;version='[2.13.1,2.13.2)',\
-	emfjson-jackson;version='[2.1.0,2.1.1)',\
 	junit-jupiter-api;version='[5.8.2,5.8.3)',\
 	junit-platform-commons;version='[1.8.2,1.8.3)',\
 	net.bytebuddy.byte-buddy;version='[1.12.8,1.12.9)',\
@@ -32,9 +31,11 @@
 	org.opentest4j;version='[1.2.0,1.2.1)',\
 	org.osgi.service.component;version='[1.4.0,1.4.1)',\
 	org.osgi.util.function;version='[1.1.0,1.1.1)',\
-	org.osgi.util.promise;version='[1.1.1,1.1.2)',\
 	org.osgi.util.pushstream;version='[1.0.1,1.0.2)',\
-	org.yaml.snakeyaml;version='[1.30.0,1.30.1)'
+	org.yaml.snakeyaml;version='[1.30.0,1.30.1)',\
+	org.apache.felix.converter;version='[1.0.18,1.0.19)',\
+	org.eclipse.emfcloud.emfjson-jackson;version='[2.1.0,2.1.1)',\
+	org.osgi.util.promise;version='[1.2.0,1.2.1)'
 
 
 

org.gecko.emf.json/src/org/gecko/emf/json/EMFJSONResourceFactoryConfigurator.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2012 - 2022 Data In Motion and others.
  * All rights reserved. 
  * 

org.gecko.emf.json/src/org/gecko/emf/json/annotation/RequireEMFJson.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2012 - 2022 Data In Motion and others.
  * All rights reserved. 
  * 

org.gecko.emf.json/src/org/gecko/emf/json/configuration/ConfigurableJsonResource.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2012 - 2022 Data In Motion and others.
  * All rights reserved. 
  * 
@@ -11,6 +11,7 @@
  */
 package org.gecko.emf.json.configuration;
 
+import static org.eclipse.emfcloud.jackson.databind.EMFContext.Attributes.ROOT_ELEMENT;
 import static org.eclipse.emfcloud.jackson.databind.EMFContext.Attributes.RESOURCE;
 import static org.eclipse.emfcloud.jackson.databind.EMFContext.Attributes.RESOURCE_SET;
 
@@ -107,11 +108,6 @@ public ObjectMapper configureMapper(Map<?, ?> options) {
 
 	private EMFModule createInitModule(Map<?, ?> options, boolean isNew) {
 		EMFModule module = new EMFModule();
-		Boolean serContainment = getOrDefault(options, EMFJs.OPTION_SERIALIZE_CONTAINMENT_AS_HREF,
-				isNew ? false : null);
-		if (serContainment != null) {
-			module.configure(Feature.OPTION_SERIALIZE_CONTAINMENT_AS_HREF, serContainment);
-		}
 		Boolean serDefaults = getOrDefault(options, EMFJs.OPTION_SERIALIZE_DEFAULT_VALUE, isNew ? false : null);
 		if (serDefaults != null) {
 			module.configure(Feature.OPTION_SERIALIZE_DEFAULT_VALUE, serDefaults);
@@ -216,6 +212,10 @@ protected void doLoad(InputStream inputStream, Map<?, ?> options) throws IOExcep
 
 			ContextAttributes attributes = EMFContext.from(options).withPerCallAttribute(RESOURCE_SET, getResourceSet())
 					.withPerCallAttribute(RESOURCE, this);
+			EClass eclass = getOrDefault(options, EMFJs.OPTION_ROOT_ELEMENT, null);
+			if (eclass != null) {
+				attributes = attributes.withPerCallAttribute(ROOT_ELEMENT, eclass);
+			}
 
 			configureMapper(options).reader().with(attributes).forType(Resource.class).withValueToUpdate(this)
 					.readValue(inputStream);

org.gecko.emf.json/src/org/gecko/emf/json/configuration/ConfigurableJsonResourceFactory.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2012 - 2022 Data In Motion and others.
  * All rights reserved. 
  * 

org.gecko.emf.json/src/org/gecko/emf/json/configuration/XMLResourceUriHandlerWrapper.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2012 - 2022 Data In Motion and others.
  * All rights reserved. 
  * 

org.gecko.emf.json/src/org/gecko/emf/json/constants/EMFJs.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2012 - 2022 Data In Motion and others.
  * All rights reserved. 
  * 
@@ -51,10 +51,6 @@ public final class EMFJs {
 	 */
 	public static final String OPTION_INDENT_OUTPUT = "OPTION_INDENT_OUTPUT";
 
-	/**
-	 * Option used to indicate the module to serialize containments as references.
-	 */
-	public static final String OPTION_SERIALIZE_CONTAINMENT_AS_HREF = "OPTION_SERIALIZE_CONTAINMENT_AS_HREF";
 	/**
 	 * When value is true, the writer will include an _id key to each json objects
 	 * and sets as value the fragment identifier.

org.gecko.emf.rest/src/org/gecko/emf/jaxrs/AbstractEMFMessageBodyReaderWriter.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2012 - 2022 Data In Motion and others.
  * All rights reserved. 
  * 

org.gecko.emf.rest/src/org/gecko/emf/jaxrs/EMFJsonAnnotationConverter.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2012 - 2022 Data In Motion and others.
  * All rights reserved. 
  * 
@@ -70,7 +70,6 @@ public void convertAnnotation(Annotation annotation, boolean serialize, Map<Obje
 
 			options.put(EMFJs.OPTION_DATE_FORMAT, config.dateFormat());
 			options.put(EMFJs.OPTION_INDENT_OUTPUT, config.indentOutput());
-			options.put(EMFJs.OPTION_SERIALIZE_CONTAINMENT_AS_HREF, config.serializeContainmentAsHref());
 			options.put(EMFJs.OPTION_SERIALIZE_DEFAULT_VALUE, config.serializeDefaultValues());
 			options.put(EMFJs.OPTION_SERIALIZE_TYPE, config.serializeTypes());
 			options.put(EMFJs.OPTION_USE_ID, config.useId());

org.gecko.emf.rest/src/org/gecko/emf/jaxrs/EMFResourceMessageBodyHandler.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2012 - 2022 Data In Motion and others.
  * All rights reserved. 
  * 

org.gecko.emf.rest/src/org/gecko/emf/jaxrs/EObjectMessageBodyHandler.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2012 - 2022 Data In Motion and others.
  * All rights reserved. 
  * 

org.gecko.emf.rest/src/org/gecko/emf/jaxrs/XMLURIHandler.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2012 - 2022 Data In Motion and others.
  * All rights reserved. 
  * 

org.gecko.emf.rest/src/org/gecko/emf/jaxrs/annotations/AnnotationConverter.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2012 - 2022 Data In Motion and others.
  * All rights reserved. 
  * 

org.gecko.emf.rest/src/org/gecko/emf/jaxrs/annotations/ContentNotEmpty.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2012 - 2022 Data In Motion and others.
  * All rights reserved. 
  * 

org.gecko.emf.rest/src/org/gecko/emf/jaxrs/annotations/EMFResourceOptions.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2012 - 2022 Data In Motion and others.
  * All rights reserved. 
  * 

org.gecko.emf.rest/src/org/gecko/emf/jaxrs/annotations/RequireEMFMessageBodyReaderWriter.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2012 - 2022 Data In Motion and others.
  * All rights reserved. 
  * 

org.gecko.emf.rest/src/org/gecko/emf/jaxrs/annotations/ResourceEClass.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2012 - 2022 Data In Motion and others.
  * All rights reserved. 
  * 

org.gecko.emf.rest/src/org/gecko/emf/jaxrs/annotations/ResourceOption.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2012 - 2022 Data In Motion and others.
  * All rights reserved. 
  * 

org.gecko.emf.rest/src/org/gecko/emf/jaxrs/annotations/ValidateContent.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2012 - 2022 Data In Motion and others.
  * All rights reserved. 
  *