Fixed incorrect nullable default in XML-CSDL

Author: hylkevds

CHANGELOG.md

@@ -7,6 +7,7 @@
 * Enabled compression in Tomcat.
 
 **Internal changes & Bugfixes**
+* Fixed incorrect nullable default in XML-CSDL.
 * Fixed #2210: issue with Projects Plugin when using String FeatureOfInterest ids.
 * Changed error when insertion fails due to constraints to 409.
 * Fixed expand returning null link when target can not be read

Plugins/OData/src/main/java/de/fraunhofer/iosb/ilt/frostserver/plugin/odata/metadata/CsdlPropertyEntity.java

@@ -41,7 +41,7 @@ public class CsdlPropertyEntity implements CsdlProperty {
 
     @JsonProperty("$Type")
     @JsonInclude(JsonInclude.Include.NON_DEFAULT)
-    public String type;
+    public String type = TYPE_DEFAULT;
 
     @JsonProperty("$Nullable")
     @JsonInclude(JsonInclude.Include.NON_DEFAULT)
@@ -70,6 +70,9 @@ public CsdlPropertyEntity generateFrom(CsdlDocument doc, Version version, String
         if (!et.getPrimaryKey().getKeyProperties().contains(ep)) {
             nullable = ep.isNullable();
         }
+        if (collection) {
+            nullable = false;
+        }
         for (Annotation an : ep.getAnnotations()) {
             annotations.add(new CsdlAnnotation().generateFrom(doc, an));
         }
@@ -106,7 +109,7 @@ public void writeXml(String nameSpace, String name, Writer writer) throws IOExce
         if (collection) {
             typeString = "Collection(" + typeString + ")";
         }
-        String nullableString = (nullable) ? " Nullable=\"" + Boolean.toString(nullable) + "\"" : "";
+        String nullableString = (nullable) ? "" : " Nullable=\"" + Boolean.toString(nullable) + "\"";
         writer.write("<Property Name=\"" + name + "\" Type=\"" + typeString + "\"" + nullableString);
         if (annotations.isEmpty()) {
             writer.write(" />");

Plugins/OData/src/main/java/de/fraunhofer/iosb/ilt/frostserver/plugin/odata/metadata/CsdlPropertyNavigation.java

@@ -38,7 +38,7 @@ public class CsdlPropertyNavigation implements CsdlProperty {
 
     @JsonProperty("$Collection")
     @JsonInclude(JsonInclude.Include.NON_DEFAULT)
-    public Boolean collection;
+    public boolean collection;
 
     @JsonProperty("$Partner")
     @JsonInclude(JsonInclude.Include.NON_DEFAULT)
@@ -50,7 +50,7 @@ public class CsdlPropertyNavigation implements CsdlProperty {
 
     @JsonProperty("$Nullable")
     @JsonInclude(JsonInclude.Include.NON_DEFAULT)
-    public Boolean nullable;
+    public boolean nullable;
 
     @JsonIgnore
     private final List<CsdlAnnotation> annotations = new ArrayList<>();
@@ -64,7 +64,11 @@ public CsdlPropertyNavigation generateFrom(CsdlDocument doc, String nameSpace, N
         if (np.isEntitySet()) {
             collection = true;
         }
-        nullable = np.isNullable();
+        if (collection) {
+            nullable = false;
+        } else {
+            nullable = np.isNullable();
+        }
         for (Annotation an : np.getAnnotations()) {
             annotations.add(new CsdlAnnotation().generateFrom(doc, an));
         }
@@ -83,11 +87,11 @@ public Map<String, Object> otherProperties() {
     @Override
     public void writeXml(String nameSpace, String name, Writer writer) throws IOException {
         String finalType = type;
-        if (collection != null && collection) {
+        if (collection) {
             finalType = "Collection(" + type + ")";
         }
         String nullableString = "";
-        if (nullable != null && nullable) {
+        if (collection || !nullable) {
             nullableString = " Nullable=\"" + Boolean.toString(nullable) + "\"";
         }
         String partnerString = "";