ontomde-java 2.0.0 → 2.0.4

data/lib/ontomde-java/java/accessorSignature.rb

@@ -21,10 +21,51 @@ module Muml_Classifier
   #NOTE:
   #* java_transform! is skipped if context[:java_transform] is false (default=true)
   def java_transform!
+    java_addDeleter!
     uml_ownedAttribute.each { |oa|
       java_addAccessorsFor!(oa)
     }
   end
+
+
+  # add a deleter that support dangling links
+  # deleted objects are mark deleted and should be processed 
+  # by a purging script in database.
+  def java_addDeleter!
+    return if kind_of?(Muml_Enumeration) || kind_of?(Muml_Interface) || kind_of?(Muml_Component)
+    return unless umlx_businessMethod?
+    return if db_isTransient?
+    m=umlx_createAndAddOperation(self.rdf_uri+"_delete")
+    m.uml_name="logicalDelete"
+    m.uml_class=self
+    m.uml_visibility=Cuml_VisibilityKind::Public
+    m.uml_isStatic=RDF_FALSE
+
+    code2=""
+    m.umlx_createAndAddComment(m.rdf_uri+"_comment","Mark object as being logicaly deleted.\nUse this method when object cannot be physically deleted because it might be\nreferenced by some other objects in memory or database.\nNote that referencer of this objects will have dangling links.\nObject fields are reseted.\nDepending on requirements, it may be\nnecessary to implement a database purge.")
+
+    self.uml_ownedAttribute.sort{ |a,b| a.java_Name.to_s <=> b.java_Name.to_s}.each {|a|
+	    v=DatatypeMapping.instance.getMapping(a.uml_type_one)
+	    c=(a.uml_isReadOnly? ) ? "// " : ""
+	    if(a.umlx_upperValueIsOne?)
+		    code2+=%{\t\t#{c}this.set#{a.java_NameBean}(#{v.java_getUndefinedValue});\n}
+	    else
+		    code2+=%{\t\t#{c}this.set#{a.java_NameBean}(null);\n}
+       	    end 
+    }
+
+    code1=""
+    if self.uml_generalization.empty? || self.uml_generalization_one.uml_general_one.java_ignoreMe?(true)
+	p=umlx_createAndAddProperty(self.rdf_uri+"_deletable")
+	p.uml_type=umlx_dataType_boolean
+	p.uml_name="isLogicallyDeleted"
+    	code1+="\t\tthis.set#{p.java_NameBean}(true);\n" 
+    elsif !self.uml_generalization.empty?
+	code1+="\t\tsuper.logicalDelete();\n" 
+    end
+    m.java_code=code1+code2
+	
+  end
         
   #Adds accessors when needed for UML properties.
   #
@@ -52,6 +93,8 @@ module Muml_Classifier
     #log.debug { "-------java.transform:Accessor for #{self.uml_name}.#{oa.uml_name}" }
     return unless context[:java_transform,true]
     return if oa.java_noAccessors?
+    #static and final interface parameter are indeed consts
+    return if oa.umlx_owner_one.kind_of?(Muml_Interface) && (oa.java_isFinal?||oa.uml_isStatic?)
 
     oa.uml_visibility=Cuml_VisibilityKind::Private
 
@@ -163,6 +206,8 @@ module Muml_Classifier
     return if oa.java_isSuggester?
     return if oa.java_noSuggester?
     return if oa.uml_isReadOnly?
+    return if oa.umlx_owner_one.umlx_hasStereotype?('DTO')
+    return if oa.umlx_owner_one.kind_of?(Muml_Interface)
     #log.debug { "add suggester (#{oa}) self=#{self}" }
     return unless context[:java_addSuggester,true]
     return if oa.uml_type_one.kind_of?(Muml_DataType) && !oa.uml_type_one.kind_of?(Muml_Enumeration)
@@ -238,10 +283,10 @@ module Muml_Classifier
   # * If property is part of a *bidirectional* association, code is generated to update automaticaly the other side of the association.
   # * If property is multivalued, the operation returns a set.
   def java_addGlobalGetter!(oa)
-    return unless context[:java_addGlobalGetter,true]
+    return nil unless context[:java_addGlobalGetter,true]
     #return if oa.uml_isDerived?
     #return unless oa.uml_isReadOnly?
-    return unless oa.java_AttributeGlobalGetter.empty?
+    return oa.java_AttributeGlobalGetter_one unless oa.java_AttributeGlobalGetter.empty?
     get=java_createAndAddMethodFromProperty(oa,"get",false)
     get.java_getter_property=oa
     oa.java_AttributeGlobalGetter=get
@@ -266,8 +311,9 @@ module Muml_Classifier
   #Reference:
   # * #java_writeGlobalSetterBody
   def java_addGlobalSetter!(oa)
-    return unless context[:java_addGlobalSetter,true]
-    return unless oa.java_AttributeGlobalSetter.empty?
+    return nil unless context[:java_addGlobalSetter,true]
+    return if oa.uml_isReadOnly?
+    return oa.java_AttributeGlobalSetter_one unless oa.java_AttributeGlobalSetter.empty?
     # a setter is generated for derived attribute as it may be implemented.
     #return unless !oa.uml_isDerived?
     set=java_createAndAddMethodFromProperty(oa,"set",false)

data/lib/ontomde-java/java/annotationOntoMDE.rb

@@ -31,51 +31,62 @@ module Muml_Classifier
       anno.uml_appliedStereotype_add(anno.umlx_getOrCreateStereotype("JavaAnnotation"))
       anno.java_customCode= <<ENDCODE
 	public enum ZoneCode {
-		/*
-		 * This annotation is used to instruct ontoMDE code generator that none
-		 * of the section related to this code construct must be preserve.
+		/**
+		 * Erase and replace this section with OntoMDE generated code.<br>
+		 *  
 		 */
 		nothing,
-		/*
-		 * This annotation is used to instruct ontoMDE code generator to
-		 * preserve the import section related to this code construct, instead
-		 * of overwriting it.
+
+		/**
+		 * Preserve imports related to this section when OntoMDE code generator is invoked.
+		 *   
+		 * Other elements (javadoc,annotations, ...) will not be preserved unless explicitely requested.<br>
 		 */
 		imports,
-		/*
-		 * This annotation is used to instruct ontoMDE code generator to
-		 * preserve the javadoc section related to this code construct, instead
-		 * of overwriting it
+
+		/**
+		 * Preserve javadoc related to this section when OntoMDE code generator is invoked.
+		 * Other elements (imports,annotations, ...) will not be preserved unless explicitely requested.<br>
 		 */
 		javadoc,
-		/*
-		 * This annotation is used to instruct ontoMDE code generator to
-		 * preserve the annotation section related to this code construct,
-		 * instead of overwriting it
+
+		/**
+		 * Preserve annotations related to this section when OntoMDE code generator is invoked.
+		 * Other elements (imports,javadoc, ...) will not be preserved unless explicitely requested.<br>
 		 */
 		annotations,
-		/*
-		 * This annotation is used to instruct ontoMDE code generator to
-		 * preserve the annotation section related to all the parameter of 
-		 * this code construct, instead of overwriting it.
+
+		/**
+		 * Preserve annotations related to this method's parameters when OntoMDE code generator is invoked.
+		 * Other elements (imports,javadoc,annotations, ...) will not be preserved unless explicitely requested.<br>
 		 */
 		anno_param,
-		/*
-		 * This annotation is used to instruct ontoMDE code generator to
-		 * preserve the code body section related to this code construct,
-		 * instead of overwriting it
+
+		/**
+		 * Preserve code body related to this method when OntoMDE code generator is invoked.
+		 * Other elements (imports,javadoc,annotations, ...) will not be preserved unless explicitely requested.<br>
+		 */
+		code,
+
+		/**
+		 * Preserve non-generated code (named custom code) included 
+		 * in this class/interface/enum when OntoMDE code generator is invoked.
+		 * This feature allows any utility methods/attributes to be added in a class.
+		 * Other elements (imports,javadoc,annotations, ...) will not be preserved unless explicitely requested. 
 		 */
-		code
+		custom
+
 	}
 
-	/*
+	/**
 	 * List of code section type that ontoMDE code will preserve on next
 	 * generation. If empty, no element will be preserved. In other word, if
-	 * empty, every element will be overwritten.
+	 * empty, every element will be overwritten.<br>
+	 *
 	 */
 	ZoneCode[] reverse();
 
-	/*
+	/**
 	 * URI used to identify uniquely model element related to this java
 	 * construct.
 	 */

data/lib/ontomde-java/java/component.rb

@@ -112,67 +112,63 @@ CONFIG
     #    else
     #      java_annotation_add("@javax.ejb.Statefull")
     #    end
-    java_annotation_add("@javax.jws.WebService")
-    
-    uml_ownedOperation.each { |op|
-      op.java_annotation_add("@javax.jws.WebMethod")
-      op.uml_ownedParameter.each{|p|
-        next if p.uml_direction_one==Cuml_ParameterDirectionKind::Return
-        p.java_annotation_add("@javax.jws.WebParam(name=\"#{p.java_Name}\")")
-      }
-    }
-       
-  end
+java_annotation_add("@javax.jws.WebService")
+
+uml_ownedOperation.each { |op|
+op.java_annotation_add("@javax.jws.WebMethod")
+op.uml_ownedParameter.each{|p|
+next if p.uml_direction_one==Cuml_ParameterDirectionKind::Return
+p.java_annotation_add("@javax.jws.WebParam(name=\"#{p.java_Name}\")")
+}
+}
+
+end
 end
 
 module Muml_TypedElement
-  #mode requested for soa 
-  rdf_attr :soa_requestedMode,[::Mrdfs_Literal]
+#mode requested for soa 
+rdf_attr :soa_requestedMode,[::Mrdfs_Literal]
 end
 module Muml_Class
-  
-  
-  # create a CRUD component associated to this class
-  # for exposing CRUD services on this object.
-  def java_createCrudComponent!
-    
-    return if umlx_hasStereotype?('DTO')
-    return if db_isDAO?
-    return unless umlx_businessMethod?
-    
-    base=self
-    p=base.umlx_owner_one
-    p=p.umlx_getOrCreatePackage(base.context[:crudComponentPackage,"ws"],p)
-    
-    c=p.umlx_createAndAddComponent("#{self.rdf_uri}_crudc","#{uml_name} CRUD")
-    #puts "component created: #{c}"
-    #struts_addCreateAndAddActions!
-      
-    create=c.umlx_createAndAddOperation("#{c.rdf_uri}_create","create")
-    ret=create.umlx_createAndAddReturnParameter("#{create.rdf_uri}")
-    ret.uml_type=base
-    ret.soa_requestedMode="ID"
-    
-    update=c.umlx_createAndAddOperation("#{c.rdf_uri}_update","update")
-    p1=update.umlx_createAndAddParameter("#{update.rdf_uri}","updateData")
+
+
+# create a CRUD component associated to this class
+# for exposing CRUD services on this object.
+def java_createCrudComponent!
+
+return if umlx_hasStereotype?('DTO')
+return if db_isDAO?
+return unless umlx_businessMethod?
+
+base=self
+p=base.umlx_owner_one
+p=p.umlx_getOrCreatePackage(base.context[:crudComponentPackage,"ws"],p)
+
+c=p.umlx_createAndAddComponent("#{self.rdf_uri}_crudc","#{uml_name} CRUD")
+#puts "component created: #{c}"
+#struts_addCreateAndAddActions!
+
+create=c.umlx_createAndAddOperation("#{c.rdf_uri}_create","create")
+ret=create.umlx_createAndAddReturnParameter("#{create.rdf_uri}")
+ret.uml_type=base
+ret.soa_requestedMode="ID"
+
+update=c.umlx_createAndAddOperation("#{c.rdf_uri}_update","update")
+p1=update.umlx_createAndAddParameter("#{update.rdf_uri}","updateData")
     p1.uml_type=base
     p1.soa_requestedMode="FULL"
   end
 end
 
 module Mrdf_Repository
-  def dto_generateCustomDTO()
-    data_model=self[:dataModel]
-    return if data_model.nil?
+	
+  def dto_forceDTO_generation!(data_model)
     cdfs=Set.new
     data_model.each { |k,v|
       next unless v.kind_of?(Msoa_customDataFilter)
       cdfs.add(v)
     }
     
-    dto_autoPopulate!
-    
-    
     uml_Class_all.each { |c|
       next unless c.kind_of?(Muml_Class)
       next if c.umlx_hasStereotype?('DTO')
@@ -182,15 +178,66 @@ module Mrdf_Repository
       cdfs.each { |v|
         #next unless v.kind_of?(Msoa_customDataFilter)
         #puts "v --> #{v.class}"
+        #force filtered class generation
         v.dto_getFilteredClass(c)
       }
     }
-    
-    #puts "!!!!!!!!!!!!!!!!!!!!!!!!!!! Proc "
-    
+  end 
+  
+  # process filter rules from protege/2000
+  def dto_generateCustomDTO_step1()
+    data_model=self[:dataModel]
+    return if data_model.nil?
+
+    dto_autoPopulate!
+    dto_forceDTO_generation!(data_model)
+    dto_processParameterFilterRule!(data_model)
+    dto_processServiceParametersNoRule!(data_model)
+  end    
+
+# For every class stereotyped DTO, replace
+# non DTO class by their DTO correspondant.
+def dto_processServiceParametersNoRule!(data_model)
+    filter_id=dto_findFilterByName("ID")
+
+    uml_Class_all.each { |clazz|
+	    #next unless  clazz.
+	    next unless clazz.umlx_hasStereotype?('DTO')
+	    puts "AAAAA #{clazz.class}  #{clazz}"
+            dto_ReplaceAllParametersByDTO!(clazz,filter_id)
+    }
+    uml_Component_all.each { |clazz|
+	    #next unless clazz.umlx_hasStereotype?('DTO')
+	    puts "AAAAA #{clazz.class}  #{clazz}"
+            dto_ReplaceAllParametersByDTO!(clazz,filter_id)
+    }
+end
+
+def dto_ReplaceAllParametersByDTO!(clazz,filter_id)
+    clazz.uml_ownedOperation.each { |op|
+	        (op.uml_returnResult+op.uml_ownedParameter).each { |param| 
+			
+			# element has already have been processed by a filter rule
+			# or it is already a DTO in source UML model
+			next if param.uml_type_one.db_isDAO?
+
+			nt=filter_id.dto_getFilteredClass(param.uml_type_one)
+			next if nt==param.uml_type_one
+			puts "changing type #{param.uml_type} -> #{nt} in #{clazz}/#{param}"
+			param.uml_type=nt
+		}
+    }
+end
+
+def dto_processParameterFilterRule!(data_model)
     s=Set.new
     data_model.each_value { |rule|
       next unless rule.kind_of?(Msoa_dataParameterFilterRule)
+      if rule.soa_filteredProperty.empty? || rule.soa_useDataFilter.empty?
+		puts "WARNING: ignored incomplete filteredProperty" 
+		next
+      end
+      #next unless rule.kind_of?(Msoa_dataFilterRule)
       s.add(rule)
     }
     s.each{|rule|
@@ -200,15 +247,19 @@ module Mrdf_Repository
 #      
       prop=rule.soa_filteredProperty_one
       prop_uml=self[prop.rdf_uri]
-#      puts "prop_uml: #{prop_uml}:#{prop_uml.class}"
+      puts "prop_uml: #{prop_uml}:#{prop_uml.class}"
       filter=rule.soa_useDataFilter_one
       fc_uml=filter.dto_getFilteredClass(prop_uml.uml_type_one)
 #      puts "fc_uml: #{fc_uml}:#{fc_uml.class}"
       
       # Replacing core type by filtered type
-#      puts "#{__LINE__} changing #{prop_uml.uml_type} to #{fc_uml} in #{prop_uml}"
+      puts "#{__LINE__} changing #{prop_uml.uml_type} to #{fc_uml} in #{prop_uml} #{prop_uml.rdf_uri}"
       prop_uml.uml_type=fc_uml
     }
+  end
+  def dto_generateCustomDTO_step2()
+    data_model=self[:dataModel]
+    return if data_model.nil?
     
     each_value { |prop_uml|
       next unless prop_uml.kind_of?(Muml_TypedElement)
@@ -217,7 +268,7 @@ module Mrdf_Repository
       filter=dto_findFilterByName(prop_uml.soa_requestedMode.to_s)
       fc_uml=filter.dto_getFilteredClass(prop_uml.uml_type_one)
 #      puts "!!!@@@!!! soa_requestedMode : #{prop_uml.soa_requestedMode} --> #{filter}"
-#      puts "#{__LINE__} changing #{prop_uml.uml_type} to #{fc_uml}"
+      puts "#{__LINE__} changing #{prop_uml.uml_type} to #{fc_uml}"
       prop_uml.uml_type=fc_uml
     }
     
@@ -265,7 +316,7 @@ module Mrdf_Repository
   end
 end
 
-module Muml_Class
+module Muml_Classifier
   rdf_attr :dto_isPopulated, [ ::Mrdfs_Literal ]
 end
 
@@ -305,7 +356,6 @@ module Msoa_dataFilter
   
   
   
-  
   def dto_findFilterByName(filterName)
     data_model=rdf_Repository #self[:dataModel]
     data_model.each_value { |rule|
@@ -360,25 +410,48 @@ module Msoa_dataFilter
   end
   
   def dto_getFilteredClass(umlClass)
-    #puts "dto_getFilteredClass(#{umlClass}:#{umlClass.class})"
-
-    if umlClass.kind_of?(Muml_PrimitiveType) || umlClass.kind_of?(Muml_DataType)
+    if umlClass.kind_of?(Muml_PrimitiveType) || umlClass.kind_of?(Muml_DataType) || umlClass.java_isATestFile? || umlClass.umlx_hasStereotype?('DTO')
+      # umlClass is a already a DTO. No further action required.
       return umlClass
-      #tpl=DatatypeMapping.instance.getMapping(umlClass)
-      #return tpl.getFormType(umlClass) #Note: class instead of field
     end
-    return umlClass if self.soa_dataFilterName.to_s=="INCLUDE"
-    #puts "#{__LINE__} #{umlClass.class}  #{umlClass.java_Name}  #{umlClass.java_qualifiedName}"
-    return umlClass if umlClass.java_qualifiedName.to_s.index("java.")==0
+
+    if self.soa_dataFilterName.to_s=="INCLUDE"
+        puts "!!! #{umlClass} INCLUDED"
+    	return umlClass 
+    end
     
+    return umlClass if umlClass.java_qualifiedName.to_s.index("java.")==0
+   
+    # umlClass is not a DTO. We now need to compute a DTO class for it.
+
+    dto=nil
+    if umlClass.kind_of?(Muml_Class)  
+	    dto=umlClass.umlx_getOrCreateClass("filter."+self.soa_dataFilterName.to_s+"."+umlClass.java_qualifiedName.to_s+"_"+self.soa_dataFilterName.to_s)
+    else
+	    dto=umlClass.umlx_getOrCreateInterface("filter."+self.soa_dataFilterName.to_s+"."+umlClass.java_qualifiedName.to_s+"_"+self.soa_dataFilterName.to_s)
+    end
     
-    dto=umlClass.umlx_getOrCreateClass("filter."+self.soa_dataFilterName.to_s+"."+umlClass.java_qualifiedName.to_s+"_"+self.soa_dataFilterName.to_s)
-    return dto if dto.dto_isPopulated?
+    dto_populateDTO(dto,umlClass) unless dto.dto_isPopulated?
+    return dto 
+  end
+
+  def dto_populateDTO(dto,umlClass)
     dto.dto_isPopulated=RDF_TRUE
+    dto.uml_appliedStereotype_add(dto.umlx_getOrCreateStereotype("DTO"))
     dto.umlx_external=RDF_FALSE
     dto.db_isTransient=RDF_TRUE
     dto.umlx_businessMethod=RDF_FALSE
-    
+
+    if(umlClass.kind_of?(Muml_Class)) 
+    umlClass.uml_implementation.each {|g|
+      clazz=dto_getFilteredClass(g.uml_supplier_one)
+      if clazz.nil?
+         puts "No filter #{self} for #{g.uml_supplier_one}. Class ignore in inheritance"
+         next
+      end
+      dto.umlx_createAndAddImplementation(clazz)
+    } 
+    end 
     #puts "dto=#{dto}"   
     umlClass.uml_generalization.each {|g|
       #adds generalization from element in same mode as current.
@@ -392,7 +465,7 @@ module Msoa_dataFilter
     }
     
     umlClass.uml_ownedAttribute.each { |sourceField|
-      #      puts "p-->#{p}"
+     #       puts "sourcField-->#{umlClass} : #{sourceField}"
       #      f=dto_getFilterRule(p)
       next if sourceField.uml_isStatic?
       #next if sourceField.uml_isFinal?
@@ -407,7 +480,7 @@ module Msoa_dataFilter
     
     #return unless sourceField.umlx_businessMethod?
     
-    #puts "adding field for #{sourceField} in dto #{dtoClass}"
+    puts "adding field for #{sourceField} in dto #{dtoClass} m=#{self}"
     
     filter=dto_getDataFilter(sourceField)
     #    if filter.nil?
@@ -416,11 +489,11 @@ module Msoa_dataFilter
     #    end
     
     if filter.soa_dataFilterName.to_s=="IGNORE"
-      #puts "IGNORE data filter"
+      puts "IGNORE data filter"
       return 
     end 
     
-#    puts "filter=#{filter.soa_dataFilterName}"
+    puts "filter=#{filter.soa_dataFilterName}"
     targetType=filter.dto_getFilteredClass(sourceField.uml_type_one)
     if targetType.nil?
       puts "nil filtered type returned for #{sourceField}"
@@ -443,4 +516,4 @@ end
 
 
 
-  
+