Revision: 16249
Author: brainslog
Date: Fri Jan 7 09:21:36 2011
Log: Adding ShData to PNR
Update Issue 2260
Added ShData to Push-Notification-Request too.
http://code.google.com/p/mobicents/source/detail?r=16249
Modified:
/trunk/servers/jain-slee/resources/diameter-sh-client/common/events/src/main/java/net/java/slee/resource/diameter/sh/events/PushNotificationRequest.java
/trunk/servers/jain-slee/resources/diameter-sh-client/common/events/src/main/java/org/mobicents/slee/resource/diameter/sh/events/PushNotificationRequestImpl.java
=======================================
---
/trunk/servers/jain-slee/resources/diameter-sh-client/common/events/src/main/java/net/java/slee/resource/diameter/sh/events/PushNotificationRequest.java
Wed Oct 7 11:55:54 2009
+++
/trunk/servers/jain-slee/resources/diameter-sh-client/common/events/src/main/java/net/java/slee/resource/diameter/sh/events/PushNotificationRequest.java
Fri Jan 7 09:21:36 2011
@@ -25,7 +25,10 @@
*/
package net.java.slee.resource.diameter.sh.events;
+import java.io.IOException;
+
import net.java.slee.resource.diameter.sh.events.avp.UserIdentityAvp;
+import net.java.slee.resource.diameter.sh.events.avp.userdata.ShData;
/**
* Defines an interface representing the Push-Notification-Request command.
@@ -99,6 +102,14 @@
*/
String getUserData();
+ /**
+ * Returns the value of the User-Data AVP, of type UserData.
+ *
+ * @return the value of the User-Data AVP or null if it has not been set
on
+ * this message
+ */
+ ShData getUserDataObject() throws IOException;
+
/**
* Sets the value of the User-Data AVP, of type UserData.
*
@@ -107,4 +118,12 @@
*/
void setUserData(String userData);
-}
+ /**
+ * Sets the value of the User-Data AVP, of type UserData.
+ *
+ * @throws IllegalStateException
+ * if setUserData has already been called
+ */
+ void setUserDataObject(ShData userData) throws IOException;
+
+}
=======================================
---
/trunk/servers/jain-slee/resources/diameter-sh-client/common/events/src/main/java/org/mobicents/slee/resource/diameter/sh/events/PushNotificationRequestImpl.java
Wed Oct 7 11:55:54 2009
+++
/trunk/servers/jain-slee/resources/diameter-sh-client/common/events/src/main/java/org/mobicents/slee/resource/diameter/sh/events/PushNotificationRequestImpl.java
Fri Jan 7 09:21:36 2011
@@ -25,9 +25,18 @@
*/
package org.mobicents.slee.resource.diameter.sh.events;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.Marshaller;
+import javax.xml.bind.Unmarshaller;
+
import net.java.slee.resource.diameter.sh.events.PushNotificationRequest;
import net.java.slee.resource.diameter.sh.events.avp.DiameterShAvpCodes;
import net.java.slee.resource.diameter.sh.events.avp.UserIdentityAvp;
+import net.java.slee.resource.diameter.sh.events.avp.userdata.ShData;
import org.jdiameter.api.Message;
import
org.mobicents.slee.resource.diameter.sh.events.avp.UserIdentityAvpImpl;
@@ -40,6 +49,18 @@
* @author <a href="mailto:[email protected]"> Alexandre Mendonca </a>
*/
public class PushNotificationRequestImpl extends DiameterShMessageImpl
implements PushNotificationRequest {
+
+ private static JAXBContext jaxbContext = initJAXBContext();
+
+ private static JAXBContext initJAXBContext() {
+ try {
+ return
JAXBContext.newInstance("net.java.slee.resource.diameter.sh.events.avp.userdata");
+ }
+ catch (Exception e) {
+ // we can't throw exception
+ return null;
+ }
+ }
/**
*
@@ -91,6 +112,24 @@
public String getUserData() {
return getAvpAsOctetString(DiameterShAvpCodes.USER_DATA,
DiameterShAvpCodes.SH_VENDOR_ID);
}
+
+ /*
+ * (non-Javadoc)
+ * @see
net.java.slee.resource.diameter.sh.events.PushNotificationRequest#getUserDataObject()
+ */
+ public ShData getUserDataObject() throws IOException {
+ ShData shDataObject = null;
+ try {
+ Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
+
+ byte[] data = getAvpAsRaw(DiameterShAvpCodes.USER_DATA,
DiameterShAvpCodes.SH_VENDOR_ID);
+ shDataObject = (ShData) unmarshaller.unmarshal(new
ByteArrayInputStream(data));
+ }
+ catch (Exception e) {
+ throw new IOException("Failed to unmarshal User-Data AVP into JAXB
Object", e);
+ }
+ return shDataObject;
+ }
/*
* (non-Javadoc)
@@ -99,5 +138,22 @@
public void setUserData(String userData) {
addAvp(DiameterShAvpCodes.USER_DATA, DiameterShAvpCodes.SH_VENDOR_ID,
userData);
}
+
+ /*
+ * (non-Javadoc)
+ * @see
net.java.slee.resource.diameter.sh.events.PushNotificationRequest#setUserDataObject(net.java.slee.resource.diameter.sh.events.avp.userdata.ShData)
+ */
+ public void setUserDataObject(ShData userData) throws IOException {
+ try {
+ Marshaller marshaller = jaxbContext.createMarshaller();
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ marshaller.marshal(userData, baos);
+ addAvp(DiameterShAvpCodes.USER_DATA,
DiameterShAvpCodes.SH_VENDOR_ID, baos.toByteArray());
+ }
+ catch (Exception e) {
+ throw new IOException("Failed to marshal JAXB Object to User-Data
AVP", e);
+ }
+ }
}