X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ONAP-REST%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Frest%2Futil%2FMSModelUtils.java;fp=ONAP-REST%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Frest%2Futil%2FMSModelUtils.java;h=e96396e0c403ead214db91955fe6943cd35abb78;hb=1148834bc4b10d00c1b1830b087357e63af8293f;hp=3880b35d844a700fe580f3de80317200f5581753;hpb=066fc4529f36d210a4a4700e8dbfd2cb42f4dc66;p=policy%2Fengine.git

diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/util/MSModelUtils.java b/ONAP-REST/src/main/java/org/onap/policy/rest/util/MSModelUtils.java
index 3880b35d8..e96396e0c 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/util/MSModelUtils.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/util/MSModelUtils.java
@@ -315,7 +315,11 @@ public class MSModelUtils {
 						if (annotation &&  obj instanceof EReference) {
 							EClass refType = ((EReference) obj).getEReferenceType();
 							if(!refType.toString().contains(eProxyURI)){
-								subAttribute.put(eStrucClassifier.getName(), refType.getName());						
+								String required = ":required-false";
+								if(eStrucClassifier.getLowerBound() == 1){
+									required = ":required-true";
+								}
+								subAttribute.put(eStrucClassifier.getName(), refType.getName() + required);						
 							}
 						}	
 					}
@@ -390,18 +394,28 @@ public class MSModelUtils {
 								refAttribute.put(eStrucClassifier.getName(), refValue);							
 							} else {
 								String array = arrayCheck(((EStructuralFeature) obj).getUpperBound());
-								refAttribute.put(eStrucClassifier.getName(), refType.getName() + array);
+								String required = ":required-false";
+								if(((EStructuralFeature) obj).getLowerBound() == 1){
+									required = ":required-true";
+								}
+								refAttribute.put(eStrucClassifier.getName(), refType.getName() + array + required);
 							}
 						} else if (annotation &&  obj instanceof EAttributeImpl){
 							EClassifier refType = ((EAttributeImpl) obj).getEType();
 							if (refType instanceof EEnumImpl){
 								String array = arrayCheck(((EStructuralFeature) obj).getUpperBound());
-								refAttribute.put(eStrucClassifier.getName(), refType.getName() + array);							}
+								String required = ":required-false";
+								if(((EStructuralFeature) obj).getLowerBound() == 1){
+									required = ":required-true";
+								}
+								refAttribute.put(eStrucClassifier.getName(), refType.getName() + array + required);							
+							}
 						}	
 					}
 				}
 			}
 		}
+		
 		return refAttribute;
 	}