Revision: 16350
Author: brainslog
Date: Wed Jan 12 07:32:28 2011
Log: Update to IMS User Profile Enabler

Update Issue 2124
Storing a data wrapper in ACI instead of complete request to fulfil compatibility with Sh-Client RA v2.2.1.FINAL

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

Added:
/trunk/servers/jain-slee/enablers/ims-user-profile/sbb/src/main/java/org/mobicents/slee/enabler/ims/userprofile/MessageData.java
Modified:
/trunk/servers/jain-slee/enablers/ims-user-profile/sbb/src/main/java/org/mobicents/slee/enabler/ims/userprofile/IMSUserProfileChildSbb.java /trunk/servers/jain-slee/enablers/ims-user-profile/sbb/src/main/java/org/mobicents/slee/enabler/ims/userprofile/RequestMappingACI.java

=======================================
--- /dev/null
+++ /trunk/servers/jain-slee/enablers/ims-user-profile/sbb/src/main/java/org/mobicents/slee/enabler/ims/userprofile/MessageData.java Wed Jan 12 07:32:28 2011
@@ -0,0 +1,189 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a full listing
+ * of individual contributors.
+ *
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU General Public License, v. 2.0.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License,
+ * v. 2.0 along with this distribution; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.mobicents.slee.enabler.ims.userprofile;
+
+import java.io.Serializable;
+
+import net.java.slee.resource.diameter.sh.events.DiameterShMessage;
+import net.java.slee.resource.diameter.sh.events.ProfileUpdateRequest;
+import net.java.slee.resource.diameter.sh.events.PushNotificationRequest;
+import net.java.slee.resource.diameter.sh.events.SubscribeNotificationsRequest;
+import net.java.slee.resource.diameter.sh.events.UserDataRequest;
+import net.java.slee.resource.diameter.sh.events.avp.DataReferenceType;
+import net.java.slee.resource.diameter.sh.events.avp.IdentitySetType;
+import net.java.slee.resource.diameter.sh.events.avp.RequestedDomainType;
+import net.java.slee.resource.diameter.sh.events.avp.SubsReqType;
+import net.java.slee.resource.diameter.sh.events.avp.UserIdentityAvp;
+
+/**
+ * Data container for request and answer matching
+ *
+ * @author <a href=mailto:[email protected]> Alexandre Mendonca </a>
+ */
+public class MessageData implements Serializable {
+
+  private static final long serialVersionUID = 1L;
+
+  private String sessionId = null;
+  private String publicIdentity = null;
+  private String msisdn = null;
+
+  private DataReferenceType dataReference;
+  private DataReferenceType[] dataReferences;
+
+  private byte[][] serviceIndications;
+
+  private IdentitySetType identitySet;
+  private String serverName;
+  private RequestedDomainType requestedDomain;
+
+  private SubsReqType subsReqType;
+
+  public MessageData(DiameterShMessage message) {
+
+    this.sessionId = message.getSessionId();
+
+    if(message instanceof UserDataRequest) {
+      UserDataRequest udr = (UserDataRequest) message;
+
+      // retrieve public identity or msisdn
+      UserIdentityAvp uIdAvp = udr.getUserIdentity();
+      this.publicIdentity = uIdAvp.getPublicIdentity();
+      this.msisdn = uIdAvp.getMsisdn();
+
+      this.dataReferences = udr.getDataReferences();
+      this.serviceIndications = udr.getServiceIndications();
+      this.identitySet = udr.getIdentitySet();
+      this.serverName = udr.getServerName();
+      this.requestedDomain = udr.getRequestedDomain();
+    }
+    else if(message instanceof ProfileUpdateRequest) {
+      ProfileUpdateRequest pur = (ProfileUpdateRequest) message;
+
+      // retrieve public identity or msisdn
+      UserIdentityAvp uIdAvp = pur.getUserIdentity();
+      this.publicIdentity = uIdAvp.getPublicIdentity();
+      this.msisdn = uIdAvp.getMsisdn();
+
+      this.dataReference = pur.getDataReference();
+    }
+    else if(message instanceof SubscribeNotificationsRequest) {
+ SubscribeNotificationsRequest snr = (SubscribeNotificationsRequest) message;
+
+      // retrieve public identity or msisdn
+      UserIdentityAvp uIdAvp = snr.getUserIdentity();
+      this.publicIdentity = uIdAvp.getPublicIdentity();
+      this.msisdn = uIdAvp.getMsisdn();
+
+      this.subsReqType = snr.getSubsReqType();
+      this.dataReferences = snr.getDataReferences();
+
+      String[] serviceIndicationStrings = snr.getServiceIndications();
+ this.serviceIndications = new byte[serviceIndicationStrings.length][];
+      for (int i = 0; i < serviceIndicationStrings.length; i++) {
+ this.serviceIndications[i] = serviceIndicationStrings[i].getBytes();
+      }
+
+      this.serverName = snr.getServerName();
+    }
+    else if(message instanceof PushNotificationRequest) {
+      PushNotificationRequest pnr = (PushNotificationRequest) message;
+
+      // retrieve public identity or msisdn
+      UserIdentityAvp uIdAvp = pnr.getUserIdentity();
+      this.publicIdentity = uIdAvp.getPublicIdentity();
+      this.msisdn = uIdAvp.getMsisdn();
+    }
+  }
+
+  /**
+   * @return the sessionId
+   */
+  public String getSessionId() {
+    return sessionId;
+  }
+
+  /**
+   * @return the publicIdentity
+   */
+  public String getPublicIdentity() {
+    return publicIdentity;
+  }
+
+  /**
+   * @return the msisdn
+   */
+  public byte[] getMsisdn() {
+    return msisdn != null ? msisdn.getBytes() : null;
+  }
+
+  /**
+   * @return the dataReference
+   */
+  public DataReferenceType getDataReference() {
+    return dataReference;
+  }
+
+  /**
+   * @return the dataReferences
+   */
+  public DataReferenceType[] getDataReferences() {
+    return dataReferences;
+  }
+
+  /**
+   * @return the serviceIndications
+   */
+  public byte[][] getServiceIndications() {
+    return serviceIndications;
+  }
+
+  /**
+   * @return the identitySet
+   */
+  public IdentitySetType getIdentitySet() {
+    return identitySet;
+  }
+
+  /**
+   * @return the serverName
+   */
+  public String getServerName() {
+    return serverName;
+  }
+
+  /**
+   * @return the requestedDomain
+   */
+  public RequestedDomainType getRequestedDomain() {
+    return requestedDomain;
+  }
+
+  /**
+   * @return the subsReqType
+   */
+  public SubsReqType getSubsReqType() {
+    return subsReqType;
+  }
+
+}
=======================================
--- /trunk/servers/jain-slee/enablers/ims-user-profile/sbb/src/main/java/org/mobicents/slee/enabler/ims/userprofile/IMSUserProfileChildSbb.java Mon Jan 10 10:44:47 2011 +++ /trunk/servers/jain-slee/enablers/ims-user-profile/sbb/src/main/java/org/mobicents/slee/enabler/ims/userprofile/IMSUserProfileChildSbb.java Wed Jan 12 07:32:28 2011
@@ -488,7 +488,7 @@
       }
     }
     else {
-      tracer.warning("User-Identity AVP missing in UDR.");
+      tracer.warning("User-Identity AVP missing in Diameter Sh Message.");
     }

     return new String[]{publicIdentity, msisdn};
@@ -510,44 +510,38 @@
ActivityContextInterface aci = diameterShClientACIF.getActivityContextInterface(activity);
     RequestMappingACI rmACI = asSbbActivityContextInterface(aci);

-    rmACI.setRequest(message);
+    rmACI.setRequestData(new MessageData(message));
   }

// -- EVENT HANDLERS FOR DIAMETER REQUESTS ----------------------------------

public void onSubscriptionNotificationsAnswer(SubscribeNotificationsAnswer event, RequestMappingACI aci) { - SubscribeNotificationsRequest snr = (SubscribeNotificationsRequest) aci.getRequest();
+    MessageData snrData = aci.getRequestData();

     aci.detach(sbbContext.getSbbLocalObject());

-    String [] userIdentityValues = getUserIdentityValues(snr);
-    SubsReqType subsReqType = snr.getSubsReqType();
+    SubsReqType subsReqType = snrData.getSubsReqType();
     long resultCode = event.getResultCode();

     // only one data ref should be present.. but at least one must!
-    DataReferenceType dataRef = snr.getDataReferences()[0];
+    DataReferenceType dataRef = snrData.getDataReferences()[0];
     switch(dataRef.getValue()) {
     case DataReferenceType._REPOSITORY_DATA:
-      // hack.. to be fixed in Resource Adaptor
-      String[] serviceIndicationStrings = snr.getServiceIndications();
- byte[][] serviceIndicationBytes = new byte[serviceIndicationStrings.length][];
-      for (int i = 0; i < serviceIndicationStrings.length; i++) {
-        serviceIndicationBytes[i] = serviceIndicationStrings[i].getBytes();
-      }
-
- getParentSbbCMP().subscribeRepositoryDataResponse(userIdentityValues[0], serviceIndicationBytes, subsReqType.getValue(), resultCode);
+      byte[][] serviceIndications = snrData.getServiceIndications();
+
+ getParentSbbCMP().subscribeRepositoryDataResponse(snrData.getPublicIdentity(), serviceIndications, subsReqType.getValue(), resultCode);
       break;
     case DataReferenceType._IMS_USER_STATE:
- getParentSbbCMP().subscribeIMSUserStateResponse(userIdentityValues[0], subsReqType.getValue(), resultCode); + getParentSbbCMP().subscribeIMSUserStateResponse(snrData.getPublicIdentity(), subsReqType.getValue(), resultCode);
       break;
     case DataReferenceType._S_CSCFNAME:
- getParentSbbCMP().subscribeSCSCFNameResponse(userIdentityValues[0], subsReqType.getValue(), resultCode); + getParentSbbCMP().subscribeSCSCFNameResponse(snrData.getPublicIdentity(), subsReqType.getValue(), resultCode);
       break;
     case DataReferenceType._INITIAL_FILTER_CRITERIA:
- getParentSbbCMP().subscribeInitialFilterCriteriaResponse(userIdentityValues[0], snr.getServerName(), subsReqType.getValue(), resultCode); + getParentSbbCMP().subscribeInitialFilterCriteriaResponse(snrData.getPublicIdentity(), snrData.getServerName(), subsReqType.getValue(), resultCode);
       break;
     case DataReferenceType._PSI_ACTIVATION:
- getParentSbbCMP().subscribePSIActivationResponse(userIdentityValues[0], subsReqType.getValue(), resultCode); + getParentSbbCMP().subscribePSIActivationResponse(snrData.getPublicIdentity(), subsReqType.getValue(), resultCode);
       break;
     default:
       //
@@ -555,20 +549,19 @@
   }

public void onProfileUpdateAnswer(ProfileUpdateAnswer event, RequestMappingACI aci) {
-    ProfileUpdateRequest pur = (ProfileUpdateRequest) aci.getRequest();
+    MessageData purData = aci.getRequestData();

     aci.detach(sbbContext.getSbbLocalObject());
-    DataReferenceType dataRef = pur.getDataReference();
-
-    String [] userIdentityValues = getUserIdentityValues(pur);
+    DataReferenceType dataRef = purData.getDataReference();
+
     long resultCode = event.getResultCode();

     switch(dataRef.getValue()) {
     case DataReferenceType._REPOSITORY_DATA:
- getParentSbbCMP().updateRepositoryDataResponse(userIdentityValues[0], resultCode); + getParentSbbCMP().updateRepositoryDataResponse(purData.getPublicIdentity(), resultCode);
       break;
     case DataReferenceType._PSI_ACTIVATION:
- getParentSbbCMP().updatePSIActivationResponse(userIdentityValues[0], resultCode); + getParentSbbCMP().updatePSIActivationResponse(purData.getPublicIdentity(), resultCode);
       break;
       default:
         //
@@ -595,49 +588,48 @@
   }

public void onUserDataAnswer(UserDataAnswer event, RequestMappingACI aci) {
-    UserDataRequest udr = (UserDataRequest) aci.getRequest();
+    MessageData udrData = aci.getRequestData();

     aci.detach(sbbContext.getSbbLocalObject());

-    String [] userIdentityValues = getUserIdentityValues(udr);
     String data = event.getUserData();
     long resultCode = event.getResultCode();

     // only one data ref should be present.. but at least one must!
-    DataReferenceType dataRef = udr.getDataReferences()[0];
+    DataReferenceType dataRef = udrData.getDataReferences()[0];
     switch(dataRef.getValue()) {
     case DataReferenceType._REPOSITORY_DATA:
- getParentSbbCMP().deliverRepositoryData(userIdentityValues[0], udr.getServiceIndications(), resultCode, data); + getParentSbbCMP().deliverRepositoryData(udrData.getPublicIdentity(), udrData.getServiceIndications(), resultCode, data);
       break;
     case DataReferenceType._IMS_PUBLIC_IDENTITY:
-      IdentitySetType identitySet = udr.getIdentitySet();
- getParentSbbCMP().deliverIMSPublicIdentity(userIdentityValues[0], userIdentityValues[1].getBytes(), identitySet != null ? identitySet.getValue() : null, resultCode, data);
+      IdentitySetType identitySet = udrData.getIdentitySet();
+ getParentSbbCMP().deliverIMSPublicIdentity(udrData.getPublicIdentity(), udrData.getMsisdn(), identitySet != null ? identitySet.getValue() : null, resultCode, data);
       break;
     case DataReferenceType._IMS_USER_STATE:
- getParentSbbCMP().deliverIMSUserState(userIdentityValues[0], resultCode, data); + getParentSbbCMP().deliverIMSUserState(udrData.getPublicIdentity(), resultCode, data);
       break;
     case DataReferenceType._S_CSCFNAME:
- getParentSbbCMP().deliverSCSCFName(userIdentityValues[0], resultCode, data); + getParentSbbCMP().deliverSCSCFName(udrData.getPublicIdentity(), resultCode, data);
       break;
     case DataReferenceType._INITIAL_FILTER_CRITERIA:
- getParentSbbCMP().deliverInitialFilterCriteria(userIdentityValues[0], udr.getServerName(), resultCode, data); + getParentSbbCMP().deliverInitialFilterCriteria(udrData.getPublicIdentity(), udrData.getServerName(), resultCode, data);
       break;
     case DataReferenceType._LOCATION_INFORMATION:
-      RequestedDomainType requestedDomain = udr.getRequestedDomain();
- getParentSbbCMP().deliverLocationInformation(userIdentityValues[1].getBytes(), requestedDomain != null ? requestedDomain.getValue() : null, resultCode, data);
+      RequestedDomainType requestedDomain = udrData.getRequestedDomain();
+ getParentSbbCMP().deliverLocationInformation(udrData.getMsisdn(), requestedDomain != null ? requestedDomain.getValue() : null, resultCode, data);
       break;
     case DataReferenceType._USER_STATE:
-      requestedDomain = udr.getRequestedDomain();
- getParentSbbCMP().deliverUserState(userIdentityValues[1].getBytes(), requestedDomain != null ? requestedDomain.getValue() : null, resultCode, data);
+      requestedDomain = udrData.getRequestedDomain();
+ getParentSbbCMP().deliverUserState(udrData.getMsisdn(), requestedDomain != null ? requestedDomain.getValue() : null, resultCode, data);
       break;
     case DataReferenceType._CHARGING_INFORMATION:
- getParentSbbCMP().deliverChargingInformation(userIdentityValues[0], userIdentityValues[1].getBytes(), resultCode, data); + getParentSbbCMP().deliverChargingInformation(udrData.getPublicIdentity(), udrData.getMsisdn(), resultCode, data);
       break;
     case DataReferenceType._MSISDN:
- getParentSbbCMP().deliverMSISDN(userIdentityValues[0], userIdentityValues[1].getBytes(), resultCode, data); + getParentSbbCMP().deliverMSISDN(udrData.getPublicIdentity(), udrData.getMsisdn(), resultCode, data);
       break;
     case DataReferenceType._PSI_ACTIVATION:
- getParentSbbCMP().deliverPSIActivation(userIdentityValues[0], resultCode, data); + getParentSbbCMP().deliverPSIActivation(udrData.getPublicIdentity(), resultCode, data);
       break;
     default:
       //
=======================================
--- /trunk/servers/jain-slee/enablers/ims-user-profile/sbb/src/main/java/org/mobicents/slee/enabler/ims/userprofile/RequestMappingACI.java Thu Jan 6 13:29:47 2011 +++ /trunk/servers/jain-slee/enablers/ims-user-profile/sbb/src/main/java/org/mobicents/slee/enabler/ims/userprofile/RequestMappingACI.java Wed Jan 12 07:32:28 2011
@@ -24,16 +24,14 @@

 import javax.slee.ActivityContextInterface;

-import net.java.slee.resource.diameter.sh.events.DiameterShMessage;
-
 /**
  *
  * @author <a href=mailto:[email protected]> Alexandre Mendonca </a>
  */
 public interface RequestMappingACI extends ActivityContextInterface {

-  public DiameterShMessage getRequest();
-
-  void setRequest(DiameterShMessage request);
+  public MessageData getRequestData();
+
+  void setRequestData(MessageData data);

 }

Reply via email to