[diameter.jain-slee] push by brainslog - Update Diameter HSS Enabler to latest Sh Client RA on 2012-08-29 00:11 GMT

Tue, 28 Aug 2012 17:12:02 -0700 

Revision: 085472dd4523
Author:   Alexandre Mendonça <ammendonca>
Date:     Tue Aug 28 17:10:33 2012
Log:      Update Diameter HSS Enabler to latest Sh Client RA

http://code.google.com/p/jain-slee/source/detail?r=085472dd4523&repo=diameter

Modified:
/enablers/hss-client/sbb/src/main/java/org/mobicents/slee/enabler/hssclient/HSSClientChild.java /enablers/hss-client/sbb/src/main/java/org/mobicents/slee/enabler/hssclient/HSSClientChildSbb.java /enablers/hss-client/sbb/src/main/java/org/mobicents/slee/enabler/hssclient/HSSClientParent.java /enablers/hss-client/sbb/src/main/java/org/mobicents/slee/enabler/hssclient/MessageData.java 

=======================================
--- /enablers/hss-client/sbb/src/main/java/org/mobicents/slee/enabler/hssclient/HSSClientChild.java Sun Aug 12 10:49:01 2012 +++ /enablers/hss-client/sbb/src/main/java/org/mobicents/slee/enabler/hssclient/HSSClientChild.java Tue Aug 28 17:10:33 2012 
@@ -51,14 +51,14 @@
    *
* @param publicIdentity the IMS Public User Identity or Public Service Identity value (if any) 
    * @param msisdn the MSISDN value (if any)
- * @param identitySet the Identity-Set value identifying which identities to retrieve, from the following values: + * @param identitySets the Identity-Set value identifying which identities to retrieve, from the following values: * ALL_IDENTITIES (0), REGISTERED_IDENTITIES (1), IMPLICIT_IDENTITIES (2) * @param destinationRealm the Diameter realm to which the request is to be sent to * @param destinationHost (optional parameter) the Diameter host (in the specified realm) to which the request is to be sent to * @return a String representing the sent request Session-Id for possible matching 
    * @throws IOException
    */
- public String getIMSPublicIdentity(String publicIdentity, byte[] msisdn, int identitySet, String destinationRealm, String destinationHost) throws IOException; + public String getIMSPublicIdentity(String publicIdentity, byte[] msisdn, int[] identitySets, String destinationRealm, String destinationHost) throws IOException; 

   /**
* Sends an User-Data-Request for IMS User State, using the following access key: 
=======================================
--- /enablers/hss-client/sbb/src/main/java/org/mobicents/slee/enabler/hssclient/HSSClientChildSbb.java Sun Aug 12 10:49:01 2012 +++ /enablers/hss-client/sbb/src/main/java/org/mobicents/slee/enabler/hssclient/HSSClientChildSbb.java Tue Aug 28 17:10:33 2012 
@@ -618,8 +618,12 @@
getParent().deliverRepositoryData(udrData.getPublicIdentity(), udrData.getServiceIndications(), resultCode, data); 
       break;
     case DataReferenceType._IMS_PUBLIC_IDENTITY:
-      IdentitySetType identitySet = udrData.getIdentitySet();
- getParent().deliverIMSPublicIdentity(udrData.getPublicIdentity(), udrData.getMsisdn(), identitySet != null ? identitySet.getValue() : null, resultCode, data); 
+      IdentitySetType[] identitySets = udrData.getIdentitySets();
+      int[] intIdentitySets = new int[identitySets.length];
+      for(int i = 0; i < identitySets.length; i++) {
+       intIdentitySets[i] = identitySets[i].getValue();
+      }
+ getParent().deliverIMSPublicIdentity(udrData.getPublicIdentity(), udrData.getMsisdn(), intIdentitySets, resultCode, data); 
       break;
     case DataReferenceType._IMS_USER_STATE:
getParent().deliverIMSUserState(udrData.getPublicIdentity(), resultCode, data); 
=======================================
--- /enablers/hss-client/sbb/src/main/java/org/mobicents/slee/enabler/hssclient/HSSClientParent.java Sun Aug 12 10:49:01 2012 +++ /enablers/hss-client/sbb/src/main/java/org/mobicents/slee/enabler/hssclient/HSSClientParent.java Tue Aug 28 17:10:33 2012 
@@ -45,11 +45,11 @@
    *
* @param publicIdentity the IMS Public User Identity or Public Service Identity value from the original request (if any) 
    * @param msisdn the MSISDN value from the original request (if any)
- * @param identitySet the Identity-Set value, identifying which identities to retrieve, from the original request + * @param identitySets the Identity-Set values, identifying which identities to retrieve, from the original request 
    * @param resultCode the Diameter Result-Code received in the answer
    * @param data a String containing the XML for the received data
    */
- public void deliverIMSPublicIdentity(String publicIdentity, byte[] msisdn, int identitySet, long resultCode, String data); + public void deliverIMSPublicIdentity(String publicIdentity, byte[] msisdn, int[] identitySets, long resultCode, String data); 

   /**
* Callback method to deliver the IMS User State data requested in getIMSUserState(..) 
=======================================
--- /enablers/hss-client/sbb/src/main/java/org/mobicents/slee/enabler/hssclient/MessageData.java Sun Aug 12 10:49:01 2012 +++ /enablers/hss-client/sbb/src/main/java/org/mobicents/slee/enabler/hssclient/MessageData.java Tue Aug 28 17:10:33 2012 
@@ -53,7 +53,7 @@

   private byte[][] serviceIndications;

-  private IdentitySetType identitySet;
+  private IdentitySetType[] identitySets;
   private String serverName;
   private RequestedDomainType requestedDomain;

@@ -73,9 +73,7 @@

       this.dataReferences = udr.getDataReferences();
       this.serviceIndications = udr.getServiceIndications();
-      if(udr.hasIdentitySet()) {
-        this.identitySet = udr.getIdentitySet();
-      }
+      this.identitySets = udr.getIdentitySets();
       if(udr.hasServerName()) {
         this.serverName = udr.getServerName();
       }
@@ -165,10 +163,10 @@
   }

   /**
-   * @return the identitySet
+   * @return the identitySets
    */
-  public IdentitySetType getIdentitySet() {
-    return identitySet;
+  public IdentitySetType[] getIdentitySets() {
+    return identitySets;
   }

   /**

Reply via email to