package org.osgi.service.onem2m.dto;
import java.util.Map;

import org.osgi.dto.DTO;

/**
 * DTO expressing Notification.
 */
public class NotificationDTO extends DTO{
	/**
	 * Notification Event
	 */
	public Map<String,Object> notificationEvent;//NotificationEventDTO
//	@javax.xml.bind.annotation.XmlElement( required  = false)
	/**
	 * Flag showing verification request. 
	 * 
	 * This field is optional.
	 */
	public Boolean verificationRequest;
//	@javax.xml.bind.annotation.XmlElement( required  = false)
	/**
	 * Flag showing subscription deletion
	 * 
	 * This field is optional.
	 */
	public Boolean subscriptionDeletion;
	
	/**
	 * URI referring subscription resource.
	 */
	public String subscriptionReference;
	
	/**
	 * creator
	 */
	public String creator;
	
	/**
	 * URI for notification target
	 */
	public String notificationForwardingURI;
//	@javax.xml.bind.annotation.XmlElement( required  = false)
	
	/**
	 * IPE Discovery Request.
	 * 
	 */
	public Map<String,Object> ipeDiscoveryRequest;//IPEDiscoveryRequestDTO
}

@@ -206,28 +206,9 @@
 lic 
-Map%3CString,Object%3E n
+N
 otif
@@ -223,12 +223,13 @@
 vent
-;//N
+DTO n
 otif
@@ -240,19 +240,17 @@
 ionEvent
-DTO
+;
 %0A//%09@jav
@@ -946,49 +946,8 @@
 lic 
-Map%3CString,Object%3E ipeDiscoveryRequest;//
 IPED
@@ -964,11 +964,32 @@
 questDTO
+ ipeDiscoveryRequest;
 %0A%7D%0A

change NotificationDTO to use specific DTO as child elements.