Revision: 16237
Author: brainslog
Date: Fri Jan  7 03:17:33 2011
Log: Adding ShData to PUR

Update Issue 2260
Added ShData to Profile-Update-Request too.


http://code.google.com/p/mobicents/source/detail?r=16237

Modified:
/trunk/servers/jain-slee/resources/diameter-sh-client/common/events/src/main/java/net/java/slee/resource/diameter/sh/events/ProfileUpdateRequest.java /trunk/servers/jain-slee/resources/diameter-sh-client/common/events/src/main/java/org/mobicents/slee/resource/diameter/sh/events/ProfileUpdateRequestImpl.java

=======================================
--- /trunk/servers/jain-slee/resources/diameter-sh-client/common/events/src/main/java/net/java/slee/resource/diameter/sh/events/ProfileUpdateRequest.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/ProfileUpdateRequest.java Fri Jan 7 03:17:33 2011
@@ -25,8 +25,11 @@
  */
 package net.java.slee.resource.diameter.sh.events;

+import java.io.IOException;
+
 import net.java.slee.resource.diameter.sh.events.avp.DataReferenceType;
 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 Profile-Update-Request command.
@@ -122,6 +125,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.
    *
@@ -130,4 +141,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/ProfileUpdateRequestImpl.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/ProfileUpdateRequestImpl.java Fri Jan 7 03:17:33 2011
@@ -25,10 +25,19 @@
  */
 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.ProfileUpdateRequest;
 import net.java.slee.resource.diameter.sh.events.avp.DataReferenceType;
 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.DiameterShMessageImpl;
@@ -42,6 +51,18 @@
  * @author <a href="mailto:[email protected]";> Alexandre Mendonca </a>
  */
public class ProfileUpdateRequestImpl extends DiameterShMessageImpl implements ProfileUpdateRequest {
+
+  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;
+    }
+  }

   /**
    *
@@ -120,6 +141,24 @@
   public String getUserData() {
return getAvpAsOctetString(DiameterShAvpCodes.USER_DATA, DiameterShAvpCodes.SH_VENDOR_ID);
   }
+
+  /*
+   * (non-Javadoc)
+ * @see net.java.slee.resource.diameter.sh.events.ProfileUpdateRequest#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)
@@ -128,5 +167,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.ProfileUpdateRequest#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);
+    }
+  }

 }

Reply via email to