ontomde-java 2.0.0 → 2.0.4

data/lib/ontomde-java/jpa/redefined.rb

@@ -33,9 +33,9 @@ module Muml_Class
     param=context[:db_useExtraTypeParameterForFindAll] ? "(#{self.java_qualifiedName})null" : ""
     tenantClause=''
     if context[:multiTenant]
-      tenantClause="#{TENANT_FIELD_NAME},"
+      tenantClause="get#{TENANT_FIELD_BEAN_NAME}(),"
     end
-    return "#{java_DAOClass_one.java_qualifiedName}.findAll(#{tenantClause}#{param})"
+    return "#{java_DAOClass_one.java_qualifiedName}.findAll(#{tenantClause}#{param},0,-1)"
   end
 
   #Method redefined from ontomde-java
@@ -46,7 +46,13 @@ module Muml_Class
       #TODO: recherche du composite commun
       #TODO: transient object do not have a valid uniq id
 
-      #if oa.umlx_oneSide?
+      # When otherSide has cardinality 1, we do not 
+      # suggest an element if it is already assigned.
+      # Feature is only available when other side is navigable
+      # because we don't want a big overhead.
+      oe=oa.umlx_otherEnd
+      filterOut=!oe.nil? && oe.umlx_isNavigable? && oe.umlx_oneSide?
+      
       if !oa.umlx_manySide?
         write( %{
 java.util.List<#{oa.uml_type_one.java_qualifiedName}> ret=#{oa.uml_type_one.db_getFindAllCall};
@@ -54,7 +60,17 @@ java.util.List<#{oa.uml_type_one.java_qualifiedName}> ret=#{oa.uml_type_one.db_g
 if(elt!=null && !ret.contains(elt)) {
 	ret.add(elt);
 }
-return ret;\n})
+#{%{java.util.Iterator<?> iter=ret.iterator();
+#{oa.uml_type_one.java_qualifiedName} item=null;
+while(iter.hasNext()){
+	item=(#{oa.uml_type_one.java_qualifiedName}) iter.next();
+          if(item.get#{oe.java_NameBean}()!=null && item.get#{oe.java_NameBean}()!=this) {
+          iter.remove();
+          }
+	}} if filterOut}
+
+
+		return ret;\n})
       else
         write( %{
 java.util.List<#{oa.uml_type_one.java_qualifiedName}> ret=#{oa.uml_type_one.db_getFindAllCall};
@@ -63,7 +79,7 @@ java.util.List<#{oa.uml_type_one.java_qualifiedName}> ret=#{oa.uml_type_one.db_g
 java.util.Iterator<?> iter=get#{oa.java_NameBean}().iterator();
 while(iter.hasNext()){
 	item=(#{oa.uml_type_one.java_qualifiedName}) iter.next();
-          if(!ret.contains(item)) {
+          if(!ret.contains(item) #{"&& (item.get#{oe.java_NameBean}()==null || item.get#{oe.java_NameBean}()==this)" if filterOut} ) {
           ret.add(item);
           }
 	}

data/lib/ontomde-java/jpa/simulationAutoImplement.rb

@@ -40,7 +40,7 @@ module Muml_Operation
       #not a persistent class
       return
     elsif fp.umlx_oneSide?
-      self.java_code=%{#{JPA_TEST_CODE_TOP}\nreturn #{fp.uml_type_one.db_getFindAllCall}.get(0);}
+      self.java_code=%{#{JPA_TEST_CODE_TOP}\nreturn #{fp.uml_type_one.db_getFindAllCall}.isEmpty() ? null : #{fp.uml_type_one.db_getFindAllCall}.get(0);}
     elsif fp.uml_isOrdered?
       self.java_code=%{#{JPA_TEST_CODE_TOP}\nreturn #{fp.uml_type_one.db_getFindAllCall};}
     else

data/lib/ontomde-java/jpdl/processOperationToClass.rb

@@ -133,8 +133,7 @@ module Muml_Class
     #m.uml_isStatic=RDF_TRUE
 
     param=m.umlx_createAndAddParameter(m.rdf_uri+"_this","_this")
-    i=c.umlx_getOrCreateInterface(DB::EntityInterface)
-    i.java_isGeneric=RDF_TRUE
+    i=c.umlx_getOrCreateGeneric(DB::EntityInterface,DB::EntityGenericParameter)
     param.uml_type=i
     param.uml_direction=Cuml_ParameterDirectionKind::In
     param.uml_upperValue=umlx_literal(1)

data/lib/ontomde-java/kbjava/rdfToJava.rb

@@ -91,20 +91,20 @@ END
       #also avoid org.junit.* import notused warning in Eclipse
       n.java_customCode="@Test\npublic void replaceWithMeaningfulTest(){}\n"
 
-      m=n.umlx_createAndAddOperation(n.rdf_uri+"merge","merge");
-      #TODO merge referenced items
-      m.java_code="return this;"
-      p=m.umlx_createAndAddReturnParameter(m.rdf_uri+'_ret',"return")
-      p.uml_type=n
-      m.umlx_businessMethod=RDF_FALSE
+      return if uml_type.context[:rel_mapping] == 'none'
 
+        m=n.umlx_createAndAddOperation(n.rdf_uri+"merge","merge");
+        #TODO merge referenced items
+        m.java_code="return this;"
+        p=m.umlx_createAndAddReturnParameter(m.rdf_uri+'_ret',"return")
+        p.uml_type=n
+        m.umlx_businessMethod=RDF_FALSE
 
-      persist=n.umlx_createAndAddOperation(n.rdf_uri+"persist","persist");
-      persist.java_code="" # #{java_debug(%{log.debug("persisting referenced persistent elements");}\n}"
-      p=persist.umlx_createAndAddReturnParameter(persist.rdf_uri+'_ret',"return")
-      p.uml_type=n
-      persist.umlx_businessMethod=RDF_FALSE
-
+        persist=n.umlx_createAndAddOperation(n.rdf_uri+"persist","persist");
+        persist.java_code="" # #{java_debug(%{log.debug("persisting referenced persistent elements");}\n}"
+        p=persist.umlx_createAndAddReturnParameter(persist.rdf_uri+'_ret',"return")
+        p.uml_type=n
+        persist.umlx_businessMethod=RDF_FALSE
 
       #v=n.umlx_createAndAddProperty(n.rdf_uri+"__source","source");
 
@@ -128,7 +128,7 @@ END
         u=d.rdf_type.kbjava_uml_model_element(@kbjava_umlSourceModel)
         p=n.umlx_createAndAddProperty(n.rdf_uri+d.rdf_uri,"#{d.kb_UML_INSTANCE_ALIAS}");
         p.uml_type=u
-        p.uml_isReadOnly=RDF_TRUE
+        p.uml_isReadOnly=RDF_FALSE
         p.java_code="null"
 
         j="#{j}\n	set#{p.java_NameBean}(source.get#{p.java_NameBean}());"
@@ -138,7 +138,7 @@ END
       m=n.umlx_createAndAddOperation(n.rdf_uri+"initData","initData")
       m.umlx_businessMethod=RDF_FALSE
       m.java_code="#{j} return this;"
-      m.java_annotation_add(%{@SuppressWarnings("unused")})
+      #m.java_annotation_add(%{@SuppressWarnings("unused")})
       p=m.umlx_createAndAddReturnParameter(m.rdf_uri+'_ret',"return")
       p.uml_type=n
 
@@ -188,6 +188,7 @@ class ::Crdfs_Class
       # Create attributes and every init methods (body expected)
       uml_type.kb_coverage_add(self)
       p=umlDataClass.umlx_createAndAddProperty(umlDataClass.rdf_uri+kbjava_varName,kbjava_varName.to_s)
+      p.uml_isReadOnly=RDF_TRUE
       p.uml_type=uml_type
       p.uml_visibility=  Cuml_VisibilityKind::Private
       #p.java_noAccessors=RDF_TRUE
@@ -212,8 +213,8 @@ class ::Crdfs_Class
       #p=self.kbjava_property_one
       i.java_code= <<ENDinit
 	if(#{p.java_Name}==null){
-		#{p.java_Name}= new #{uml_type.java_qualifiedName}();
-		#{p.uml_type_one.java_qualifiedName} elt= #{p.java_Name};
+		#{p.uml_type_one.java_qualifiedName} elt= new #{uml_type.java_qualifiedName}();
+		#{p.java_Name}=elt;
 		#{mtk_stss{kbjava_writeJavaObjectSetters(dataSource)}}
 	}
 	return #{p.java_Name};
@@ -359,6 +360,14 @@ class DatatypeMappingLong < DatatypeMappingOrdinal
     return valitem.gsub(/^0*([0-9])/,'\1')
   end
 end
+class DatatypeMappingLongObject < DatatypeMappingOrdinal
+  # Protege string to Java code conversions
+  def prot_convertToJava(umlprop,valitem)
+    #Remove leading 0 (octal)
+    return %{new Long("#{valitem.gsub(/^0*([0-9])/,'\1')}")}
+  end
+end
+
 class DatatypeMappingFile < DatatypeMapping
   # Protege string to Java code conversions
   def prot_convertToJava(umlprop,valitem)

data/lib/ontomde-java/struts.rb

@@ -20,8 +20,8 @@ require 'ontomde-java/struts/blob.rb'
 require 'ontomde-java/struts/reloadAction.rb'
 require 'ontomde-java/struts/xmlForm.rb'
 require 'ontomde-java/struts/spring.rb'
-require 'ontomde-java/struts/mappingForBean.rb'
 require 'ontomde-java/struts/mappingForJsp.rb'
 require 'ontomde-java/struts/mappingToJavaHierarchy.rb'
 require 'ontomde-java/struts/exceptionHandling.rb'
+require 'ontomde-java/struts/mappingForBean.rb'
 

data/lib/ontomde-java/struts/MessageResources.rb

@@ -87,13 +87,14 @@ def writeMessagesFromModel(locale,fillFromModel=false,test=false)
 	write "# Enumerations\n"
 	write "# *********************\n"
 	uml_Class_all.each {|c|
-		next unless c.kind_of?(Muml_Enumeration)
-		msg=c.java_enumAssignableDataType_inv.empty? ? "-- --" : "create and add"
-		struts_writeMsgRes("#{c.java_qualifiedName}.#{::Muml_Property::NIL_LVB_RES_KEY}",msg,!fillFromModel,locale)
-
-		c.uml_ownedLiteral.each {|ol|
-			struts_writeMsgRes("#{c.java_qualifiedName}.#{ol.java_Name}",ol.to_s,!fillFromModel,locale)
+		if c.kind_of?(Muml_Enumeration)
+			java_genEnumMsgRes(c,fillFromModel,locale)
+		else
+			c.uml_nestedClassifier.each  { |nc|
+				next unless nc.kind_of?(Muml_Enumeration)
+				java_genEnumMsgRes(nc,fillFromModel,locale)
 			}
+		end
 		}
 
 	write "# *********************\n"
@@ -101,6 +102,14 @@ def writeMessagesFromModel(locale,fillFromModel=false,test=false)
 	write "# *********************\n"
 
 end
+def java_genEnumMsgRes(c,fillFromModel,locale)
+	msg=c.java_enumAssignableDataType_inv.empty? ? "-- --" : "create and add"
+	struts_writeMsgRes("#{c.java_qualifiedName}.#{::Muml_Property::NIL_LVB_RES_KEY}",msg,!fillFromModel,locale)
+
+	c.uml_ownedLiteral.each {|ol|
+		struts_writeMsgRes("#{c.java_qualifiedName}.#{ol.java_Name}",ol.to_s,!fillFromModel,locale)
+		}
+end
 
 MESSAGE_RES_EN=<<ENDEN
 java.lang.Boolean.true=true

data/lib/ontomde-java/struts/action.rb

@@ -14,7 +14,7 @@ module Muml_Classifier
   #terminate local treatment and return control to calling controller.
   STRUTS_RETURN_ACTION="returnTo"
   #Resume local treatment avect geting control back from another controler.
-  STRUTS_RESUME_ACTION="resume"
+  STRUTS_RESUME_ACTION="resumeAct"
 
   STRUTS_REFRESH_ACTION="executeRefresh"
   STRUTS_SGBD_STATE="sgbd_state"
@@ -75,7 +75,7 @@ ENDMETH
 
   def struts_addActionBiz!
     action=struts_createAndAddActionBase!
-    struts_addStartEditAction!(action)
+    struts_addStartEditActionBiz!(action)
 
     struts_addsetTimeZoneAction!(action)
     struts_addsetSkinAction!(action)
@@ -114,6 +114,14 @@ ENDMETH
   end
 
   def struts_addProceedBizAction!(action)
+    # form contains a parameter generated from an operation return parameter
+    # if true, proceed has no return to display. Thus, return screen is skipped
+    hasMethodToClassReturn=false;
+    struts_formAttribute.each { |a|
+	hasMethodToClassReturn=a.java_isMethodToClassReturn?
+	break if hasMethodToClassReturn
+    }
+
     proceed=action.struts_createAndAddExecuteOperation(STRUTS_PROCEED_ACTION)
     proceed.java_code=<<ENDMETH
 	#{struts_formCastJavaCode}
@@ -121,13 +129,28 @@ ENDMETH
 	form.getReference().proceed();
 	form.initFromReference();
 	form.set#{STRUTS_DISPATCH_FIELD_METH}("#{STRUTS_CREATE_ACTION}");
-	return new org.apache.struts.action.ActionForward("/pages/#{java_InternalFilePath}form/#{java_Name}#{STRUTS_RESULTS_FWD}.jsp",false);
+        #{!hasMethodToClassReturn ? "return returnTo(mapping, abstractForm, request, response);": %{return new org.apache.struts.action.ActionForward("/pages/#{java_InternalFilePath}form/#{java_Name}#{STRUTS_RESULTS_FWD}.jsp",false);}}
 ENDMETH
   end
 
   STRUTS_SESSION_KEY_EditAction="objToEdit"
+  JUMP_TO_PROCEED=<<ENDSKIP
+			if (form.getReference().get#{STRUTS_APPLY_TO_PROP}()!=null) {
+  				//form contains only #{STRUTS_APPLY_TO_PROP} field and it is not null
+				//skip input screen and jump to #{STRUTS_PROCEED_ACTION}
+				return #{STRUTS_PROCEED_ACTION}(mapping, abstractForm, request, response);
+			}
+ENDSKIP
 
-  def struts_addStartEditAction!(action)
+  def struts_addStartEditActionBiz!(action)
+	#puts "############# #{uml_name} #{struts_formAttribute.length}"
+	# add code to skip input screen when no user input is necessary
+	# (first attribute is applyTo)
+	optCode= struts_formAttribute(false,true).length > 0 ? '' : JUMP_TO_PROCEED 
+  	return struts_addStartEditAction!(action,optCode)
+  end
+
+  def struts_addStartEditAction!(action,optCode="")
     edit=action.struts_createAndAddExecuteOperation(STRUTS_ACTION_STARTEDIT)
     edit.java_code= <<ENDCODE
 			#{struts_formCastJavaCode}
@@ -136,7 +159,7 @@ ENDMETH
 			session.removeAttribute("#{STRUTS_SESSION_KEY_EditAction}");
 			form.setReference(obj);
 			form.initFromReference();
-			form.setSgbd_state("#{STRUTS_UPDATE_ACTION}");
+			form.setSgbd_state("#{STRUTS_UPDATE_ACTION}"); #{optCode}
 			return mapping.findForward("#{STRUTS_INPUT_FWD}");
 ENDCODE
   end
@@ -250,6 +273,14 @@ ENDCODE
   end
 
 
+PROCEED_ACTION_CODE=<<ENDTPL
+String msg="unexpected value for #{STRUTS_SGBD_STATE_PROP} in #{STRUTS_PROCEED_ACTION}";
+log.error(msg);
+org.apache.struts.action.ActionErrors ae=new org.apache.struts.action.ActionErrors();
+ae.add("Error processing request",new  org.apache.struts.action.ActionMessage("errors.ioException",msg));
+saveErrors(request, ae);
+return mapping.findForward("#{STRUTS_INPUT_FWD}");
+ENDTPL
 
   def struts_addProceedAction!(action)
     proca=action.struts_createAndAddExecuteOperation(STRUTS_PROCEED_ACTION)
@@ -261,14 +292,7 @@ String s=form.get#{STRUTS_SGBD_STATE_PROP}();
     [STRUTS_NEW_ACTION,STRUTS_CREATE_ACTION,STRUTS_UPDATE_ACTION,STRUTS_READ_ACTION,STRUTS_DELETE_ACTION].each {|m|
       j=j+%{if(s.compareTo("#{m}")==0) { return #{m}(mapping,form,request,response); }\n}
     }
-    j=j+%{
-String msg="unexpected value for #{STRUTS_SGBD_STATE_PROP} in #{STRUTS_PROCEED_ACTION}";
-log.error(msg);
-org.apache.struts.action.ActionErrors ae=new org.apache.struts.action.ActionErrors();
-ae.add("Error processing request",new  org.apache.struts.action.ActionMessage("errors.ioException",msg));
-saveErrors(request, ae);
-return mapping.findForward("#{STRUTS_INPUT_FWD}");
-    }
+    j=j+PROCEED_ACTION_CODE
     proca.java_code=j
   end
 

data/lib/ontomde-java/struts/form.rb

@@ -46,7 +46,7 @@ module Muml_Classifier
 		}
 	end
 	#every attribute meant to appear in the form.
-	def struts_formAttribute(ignoreDbId=false)
+	def struts_formAttribute(ignoreDbId=false,ignoreApplyToOrReturn=false)
 		#tab=context[:struts_tab,nil]
 
 		ret=Array.new
@@ -55,6 +55,7 @@ module Muml_Classifier
 		cgi.each { |c|
 			c.uml_ownedAttribute.each { |a|
 				next if a.struts_ignoreInForm?(ignoreDbId)
+				next if ignoreApplyToOrReturn && a.java_isMethodToClassApplyToOrReturn?
 				ret << a
 				}
 		}
@@ -159,15 +160,20 @@ module Muml_Classifier
 		#log.debug{ "addCopyTo #{self}" }
 		form=struts_actionForm_one
 		cpt=form.umlx_createAndAddOperation(form.rdf_uri+"_copyTo","copyTo")
-		cpt.java_annotation_add(%{@SuppressWarnings("unused")})
+		#cpt.java_annotation_add(%{@SuppressWarnings("unused")})
 		pcpt=cpt.umlx_createAndAddParameter(cpt.rdf_uri+"_to","_to")
 		pcpt.uml_direction=Cuml_ParameterDirectionKind::Inout
 		pcpt.uml_type=self
 		code="java.util.TimeZone currentTimeZone = java.util.TimeZone.getTimeZone(get#{STRUTS_SETTIMEZONE_BEAN}());"
+		code=code+"if(currentTimeZone==null) {}\n" # quick hack to avoid unused/not unused warning
 		struts_formAttribute.each { |a|
- 			code=code+"if(this.get#{a.java_NameBean}()!=null) {\n  " if(STRUTS_ACCEPT_NULL_FIELD_IN_FORMS)
-			code=code+"#{DatatypeMapping.instance.getMapping(a.uml_type_one).getFormCopyTo(a)}"
-		code=code+"  }//test !=null\n" if(STRUTS_ACCEPT_NULL_FIELD_IN_FORMS)
+			if(a.uml_isReadOnly?) 
+				code=code+"\t\/\/ a.java_NameBean (read-only)\n"
+			else
+ 				code=code+"if(this.get#{a.java_NameBean}()!=null) {\n  " if(STRUTS_ACCEPT_NULL_FIELD_IN_FORMS)
+				code=code+"#{DatatypeMapping.instance.getMapping(a.uml_type_one).getFormCopyTo(a)}"
+				code=code+"  }//test !=null\n" if(STRUTS_ACCEPT_NULL_FIELD_IN_FORMS)
+			end
 		}
 
 		cpt.java_code=code
@@ -194,7 +200,7 @@ module Muml_Classifier
 	def struts_addInitFrom!
 		form=struts_actionForm_one
 		inf=form.umlx_createAndAddOperation(form.rdf_uri+"_initFrom","initFrom")
-		inf.java_annotation_add(%{@SuppressWarnings("unused")})
+		#inf.java_annotation_add(%{@SuppressWarnings("unused")})
 		pinf=inf.umlx_createAndAddParameter(inf.rdf_uri+"_from","_from")
 		pinf.uml_type=self
 		pinf.uml_direction=Cuml_ParameterDirectionKind::In
@@ -277,9 +283,14 @@ module Muml_Property
 			struts_addActionFormAttributeEnumeration!(form)
 		elsif uml_type_one.kind_of?(Muml_DataType)
 			a2=struts_copyAsFormField!(form)
-			#a2.uml_type=form.umlx_dataType_string
+			
+			#Force cardinality to one (array of primitive is handeld has multi-line text)
+			a2.uml_upperValue=form.umlx_literal(1)
+			
 			tpl=DatatypeMapping.instance.getMapping(uml_type_one)
 			a2.uml_type=tpl.getFormType(form)
+
+
 		else
 			struts_addActionFormAttributeReference!(form)
 
@@ -431,6 +442,85 @@ public static java.util.List<#{STRUTS_LVB}> #{STRUTS_FORM_HELPER_ENUMTOLVB}(fina
 		throw(e);
 	}
 			}
+	@SuppressWarnings("unchecked")
+	public static <T> java.util.Set<T> toBean(T[] t, java.util.Set<T> nullCast) {
+		java.util.Set<T> ret = null;
+		if (t != null) {
+			ret = (java.util.Set<T>) new java.util.HashSet<T>();
+			for (int i = 0; i < t.length; i++) {
+				ret.add(t[i]);
+			}
+		}
+		return ret;
+	}
+
+	@SuppressWarnings("unchecked")
+	public static <T> java.util.List<T> toBean(T[] t, java.util.List<T> nullCast) {
+		java.util.List<T> ret = null;
+		if (t != null) {
+			// alternative: java.util.Arrays.asList
+
+			ret = (java.util.List<T>) new java.util.ArrayList<T>();
+			for (int i = 0; i < t.length; i++) {
+				ret.add(t[i]);
+			}
+		}
+		return ret;
+	}
+
+	public static boolean toBean(String t, boolean nullCast) {
+		return t.compareTo("true") == 0;
+	}
+
+	public static String toForm(boolean t) {
+		return t ? "true" : "false";
+	}
+
+	@SuppressWarnings("unchecked")
+	public static <T> T[] toForm(java.util.Set<T> t) {
+		return (T[]) t.toArray();
+	}
+
+	@SuppressWarnings("unchecked")
+	public static <T> T[] toForm(java.util.List<T> t) {
+		return (T[]) t.toArray();
+	}
+
+	/**
+	 * Map an array of value to a multi-line text
+	 * (meant for string[])
+	 * @param <T>
+	 * @param t
+	 * @return
+	 */
+	@SuppressWarnings("unchecked")
+	public static <T> String toFormArrayAsStringLine(java.util.Collection<T> t) {
+		java.lang.StringBuffer sb=new java.lang.StringBuffer();
+		for (java.util.Iterator iterator = t.iterator(); iterator.hasNext();) {
+			T t2 = (T) iterator.next();
+			sb.append(t2.toString());
+			sb.append(ARRAY_SEPARATOR);
+		}
+		return sb.toString();
+	}
+
+
+	public static String ARRAY_SEPARATOR="\\n";
+	
+	@SuppressWarnings("unchecked")
+	public static java.util.Set<String> toBean(String t, java.util.Set<String> nullCast) {
+		java.util.Set<String> ret = null;
+		if (t != null) {
+			String[] tline=t.split(ARRAY_SEPARATOR);
+			ret = (java.util.Set<String>) new java.util.HashSet<String>();
+			for (int i = 0; i < tline.length; i++) {
+				ret.add(tline[i]);
+			}
+		}
+		return ret;
+	}
+
+
 ENDCODE
   
         def struts_getFormHelper