Revision: 16419
Author: brainslog
Date: Thu Jan 13 21:31:56 2011
Log: Update to IMS User Profile Enabler

Update Issue 2124
Some fixes after testing


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

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/MessageData.java /trunk/servers/jain-slee/enablers/ims-user-profile/sbb/src/main/resources/META-INF/sbb-jar.xml

=======================================
--- /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 +++ /trunk/servers/jain-slee/enablers/ims-user-profile/sbb/src/main/java/org/mobicents/slee/enabler/ims/userprofile/IMSUserProfileChildSbb.java Thu Jan 13 21:31:56 2011
@@ -34,6 +34,7 @@
 import javax.slee.SbbContext;
 import javax.slee.facilities.Tracer;

+import net.java.slee.resource.diameter.base.events.avp.AuthSessionStateType;
 import net.java.slee.resource.diameter.base.events.avp.DiameterIdentity;
 import net.java.slee.resource.diameter.sh.DiameterShAvpFactory;
 import net.java.slee.resource.diameter.sh.client.ShClientActivity;
@@ -80,6 +81,7 @@
UserIdentityAvp publicIdentityAvp = createUserIdentityAvp(publicIdentity, null);

UserDataRequest udr = diameterShClientMessageFactory.createUserDataRequest(publicIdentityAvp, DataReferenceType.REPOSITORY_DATA);
+    udr.setAuthSessionState(AuthSessionStateType.NO_STATE_MAINTAINED);
     udr.setServiceIndications(serviceIndications);

     // Set destination -- Realm is mandatory, host is optional
@@ -102,6 +104,7 @@
UserIdentityAvp publicIdentityAvp = createUserIdentityAvp(publicIdentity, msisdn);

UserDataRequest udr = diameterShClientMessageFactory.createUserDataRequest(publicIdentityAvp, DataReferenceType.IMS_PUBLIC_IDENTITY);
+    udr.setAuthSessionState(AuthSessionStateType.NO_STATE_MAINTAINED);
     udr.setIdentitySet(IdentitySetType.fromInt(identitySet));

     // Set destination -- Realm is mandatory, host is optional
@@ -124,6 +127,7 @@
UserIdentityAvp publicIdentityAvp = createUserIdentityAvp(publicIdentity, null);

UserDataRequest udr = diameterShClientMessageFactory.createUserDataRequest(publicIdentityAvp, DataReferenceType.IMS_USER_STATE);
+    udr.setAuthSessionState(AuthSessionStateType.NO_STATE_MAINTAINED);

     // Set destination -- Realm is mandatory, host is optional
     udr.setDestinationRealm(new DiameterIdentity(destinationRealm));
@@ -145,6 +149,7 @@
UserIdentityAvp publicIdentityAvp = createUserIdentityAvp(publicIdentity, null);

UserDataRequest udr = diameterShClientMessageFactory.createUserDataRequest(publicIdentityAvp, DataReferenceType.S_CSCFNAME);
+    udr.setAuthSessionState(AuthSessionStateType.NO_STATE_MAINTAINED);

     // Set destination -- Realm is mandatory, host is optional
     udr.setDestinationRealm(new DiameterIdentity(destinationRealm));
@@ -166,6 +171,7 @@
UserIdentityAvp publicIdentityAvp = createUserIdentityAvp(publicIdentity, null);

UserDataRequest udr = diameterShClientMessageFactory.createUserDataRequest(publicIdentityAvp, DataReferenceType.INITIAL_FILTER_CRITERIA);
+    udr.setAuthSessionState(AuthSessionStateType.NO_STATE_MAINTAINED);
     udr.setServerName(serverName);

     // Set destination -- Realm is mandatory, host is optional
@@ -188,6 +194,7 @@
UserIdentityAvp publicIdentityAvp = createUserIdentityAvp(null, msisdn);

UserDataRequest udr = diameterShClientMessageFactory.createUserDataRequest(publicIdentityAvp, DataReferenceType.LOCATION_INFORMATION);
+    udr.setAuthSessionState(AuthSessionStateType.NO_STATE_MAINTAINED);
     udr.setRequestedDomain(RequestedDomainType.fromInt(requestedDomain));

     // Set destination -- Realm is mandatory, host is optional
@@ -210,6 +217,7 @@
UserIdentityAvp publicIdentityAvp = createUserIdentityAvp(null, msisdn);

UserDataRequest udr = diameterShClientMessageFactory.createUserDataRequest(publicIdentityAvp, DataReferenceType.USER_STATE);
+    udr.setAuthSessionState(AuthSessionStateType.NO_STATE_MAINTAINED);
     udr.setRequestedDomain(RequestedDomainType.fromInt(requestedDomain));

     // Set destination -- Realm is mandatory, host is optional
@@ -232,6 +240,7 @@
UserIdentityAvp publicIdentityAvp = createUserIdentityAvp(publicIdentity, msisdn);

UserDataRequest udr = diameterShClientMessageFactory.createUserDataRequest(publicIdentityAvp, DataReferenceType.CHARGING_INFORMATION);
+    udr.setAuthSessionState(AuthSessionStateType.NO_STATE_MAINTAINED);

     // Set destination -- Realm is mandatory, host is optional
     udr.setDestinationRealm(new DiameterIdentity(destinationRealm));
@@ -253,6 +262,7 @@
UserIdentityAvp publicIdentityAvp = createUserIdentityAvp(publicIdentity, msisdn);

UserDataRequest udr = diameterShClientMessageFactory.createUserDataRequest(publicIdentityAvp, DataReferenceType.MSISDN);
+    udr.setAuthSessionState(AuthSessionStateType.NO_STATE_MAINTAINED);

     // Set destination -- Realm is mandatory, host is optional
     udr.setDestinationRealm(new DiameterIdentity(destinationRealm));
@@ -274,6 +284,7 @@
UserIdentityAvp publicIdentityAvp = createUserIdentityAvp(publicIdentity, null);

UserDataRequest udr = diameterShClientMessageFactory.createUserDataRequest(publicIdentityAvp, DataReferenceType.PSI_ACTIVATION);
+    udr.setAuthSessionState(AuthSessionStateType.NO_STATE_MAINTAINED);

     // Set destination -- Realm is mandatory, host is optional
     udr.setDestinationRealm(new DiameterIdentity(destinationRealm));
@@ -295,6 +306,7 @@
UserIdentityAvp publicIdentityAvp = createUserIdentityAvp(publicIdentity, null);

ProfileUpdateRequest pur = diameterShClientMessageFactory.createProfileUpdateRequest(publicIdentityAvp, DataReferenceType.REPOSITORY_DATA, data.getBytes());
+    pur.setAuthSessionState(AuthSessionStateType.NO_STATE_MAINTAINED);

     // Set destination -- Realm is mandatory, host is optional
     pur.setDestinationRealm(new DiameterIdentity(destinationRealm));
@@ -316,6 +328,7 @@
UserIdentityAvp publicIdentityAvp = createUserIdentityAvp(publicIdentity, null);

ProfileUpdateRequest pur = diameterShClientMessageFactory.createProfileUpdateRequest(publicIdentityAvp, DataReferenceType.PSI_ACTIVATION, data.getBytes());
+    pur.setAuthSessionState(AuthSessionStateType.NO_STATE_MAINTAINED);

     // Set destination -- Realm is mandatory, host is optional
     pur.setDestinationRealm(new DiameterIdentity(destinationRealm));
@@ -337,7 +350,8 @@
UserIdentityAvp publicIdentityAvp = createUserIdentityAvp(publicIdentity, null);

SubscribeNotificationsRequest snr = diameterShClientMessageFactory.createSubscribeNotificationsRequest(publicIdentityAvp, DataReferenceType.REPOSITORY_DATA, SubsReqType.fromInt(subscriptionRequestType));
-
+    snr.setAuthSessionState(AuthSessionStateType.NO_STATE_MAINTAINED);
+
     // hack.. to be fixed in Resource Adaptor
String[] serviceIndicationStrings = new String[serviceIndications.length];
     for (int i = 0; i < serviceIndications.length; i++) {
@@ -366,6 +380,7 @@
UserIdentityAvp publicIdentityAvp = createUserIdentityAvp(publicIdentity, null);

SubscribeNotificationsRequest snr = diameterShClientMessageFactory.createSubscribeNotificationsRequest(publicIdentityAvp, DataReferenceType.IMS_USER_STATE, SubsReqType.fromInt(subscriptionRequestType));
+    snr.setAuthSessionState(AuthSessionStateType.NO_STATE_MAINTAINED);

     // Set destination -- Realm is mandatory, host is optional
     snr.setDestinationRealm(new DiameterIdentity(destinationRealm));
@@ -387,6 +402,7 @@
UserIdentityAvp publicIdentityAvp = createUserIdentityAvp(publicIdentity, null);

SubscribeNotificationsRequest snr = diameterShClientMessageFactory.createSubscribeNotificationsRequest(publicIdentityAvp, DataReferenceType.S_CSCFNAME, SubsReqType.fromInt(subscriptionRequestType));
+    snr.setAuthSessionState(AuthSessionStateType.NO_STATE_MAINTAINED);

     // Set destination -- Realm is mandatory, host is optional
     snr.setDestinationRealm(new DiameterIdentity(destinationRealm));
@@ -408,6 +424,7 @@
UserIdentityAvp publicIdentityAvp = createUserIdentityAvp(publicIdentity, null);

SubscribeNotificationsRequest snr = diameterShClientMessageFactory.createSubscribeNotificationsRequest(publicIdentityAvp, DataReferenceType.INITIAL_FILTER_CRITERIA, SubsReqType.fromInt(subscriptionRequestType));
+    snr.setAuthSessionState(AuthSessionStateType.NO_STATE_MAINTAINED);
     snr.setServerName(serverName);

     // Set destination -- Realm is mandatory, host is optional
@@ -430,6 +447,7 @@
UserIdentityAvp publicIdentityAvp = createUserIdentityAvp(publicIdentity, null);

SubscribeNotificationsRequest snr = diameterShClientMessageFactory.createSubscribeNotificationsRequest(publicIdentityAvp, DataReferenceType.PSI_ACTIVATION, SubsReqType.fromInt(subscriptionRequestType));
+    snr.setAuthSessionState(AuthSessionStateType.NO_STATE_MAINTAINED);

     // Set destination -- Realm is mandatory, host is optional
     snr.setDestinationRealm(new DiameterIdentity(destinationRealm));
@@ -576,7 +594,7 @@
       activity.sendPushNotificationAnswer(2001L, true);
     }
     catch (IOException e) {
-      tracer.warning("Failed to sen Push-Notification-Answer.", e);
+      tracer.warning("Failed to send Push-Notification-Answer.", e);
     }

     // Retrieve useful data from request
@@ -590,8 +608,6 @@
public void onUserDataAnswer(UserDataAnswer event, RequestMappingACI aci) {
     MessageData udrData = aci.getRequestData();

-    aci.detach(sbbContext.getSbbLocalObject());
-
     String data = event.getUserData();
     long resultCode = event.getResultCode();

@@ -634,6 +650,8 @@
     default:
       //
     }
+
+    aci.detach(sbbContext.getSbbLocalObject());
   }

// -- CMP FIELDs ------------------------------------------------------------
=======================================
--- /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 +++ /trunk/servers/jain-slee/enablers/ims-user-profile/sbb/src/main/java/org/mobicents/slee/enabler/ims/userprofile/MessageData.java Thu Jan 13 21:31:56 2011
@@ -70,12 +70,18 @@
       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();
+      if(udr.hasIdentitySet()) {
+        this.identitySet = udr.getIdentitySet();
+      }
+      if(udr.hasServerName()) {
+        this.serverName = udr.getServerName();
+      }
+      if(udr.hasRequestedDomain()) {
+        this.requestedDomain = udr.getRequestedDomain();
+      }
     }
     else if(message instanceof ProfileUpdateRequest) {
       ProfileUpdateRequest pur = (ProfileUpdateRequest) message;
@@ -84,7 +90,7 @@
       UserIdentityAvp uIdAvp = pur.getUserIdentity();
       this.publicIdentity = uIdAvp.getPublicIdentity();
       this.msisdn = uIdAvp.getMsisdn();
-
+
       this.dataReference = pur.getDataReference();
     }
     else if(message instanceof SubscribeNotificationsRequest) {
@@ -94,8 +100,10 @@
       UserIdentityAvp uIdAvp = snr.getUserIdentity();
       this.publicIdentity = uIdAvp.getPublicIdentity();
       this.msisdn = uIdAvp.getMsisdn();
-
-      this.subsReqType = snr.getSubsReqType();
+
+      if(snr.hasSubsReqType()) {
+        this.subsReqType = snr.getSubsReqType();
+      }
       this.dataReferences = snr.getDataReferences();

       String[] serviceIndicationStrings = snr.getServiceIndications();
@@ -104,7 +112,9 @@
this.serviceIndications[i] = serviceIndicationStrings[i].getBytes();
       }

-      this.serverName = snr.getServerName();
+      if(snr.hasServerName()) {
+        this.serverName = snr.getServerName();
+      }
     }
     else if(message instanceof PushNotificationRequest) {
       PushNotificationRequest pnr = (PushNotificationRequest) message;
=======================================
--- /trunk/servers/jain-slee/enablers/ims-user-profile/sbb/src/main/resources/META-INF/sbb-jar.xml Fri Jan 7 13:41:23 2011 +++ /trunk/servers/jain-slee/enablers/ims-user-profile/sbb/src/main/resources/META-INF/sbb-jar.xml Thu Jan 13 21:31:56 2011
@@ -38,7 +38,7 @@
             <initial-event-select variable="ActivityContext" />
         </event>

-        <event event-direction="Receive" initial-event="False">
+        <event event-direction="Receive" initial-event="True">
             <event-name>UserDataAnswer</event-name>
             <event-type-ref>
<event-type-name>net.java.slee.resource.diameter.sh.events.UserDataAnswer</event-type-name>
@@ -48,7 +48,7 @@
             <initial-event-select variable="ActivityContext" />
         </event>

-        <event event-direction="Receive" initial-event="False">
+        <event event-direction="Receive" initial-event="True">
             <event-name>ProfileUpdateAnswer</event-name>
             <event-type-ref>
<event-type-name>net.java.slee.resource.diameter.sh.events.ProfileUpdateAnswer</event-type-name>
@@ -58,7 +58,7 @@
             <initial-event-select variable="ActivityContext" />
         </event>

-        <event event-direction="Receive" initial-event="False">
+        <event event-direction="Receive" initial-event="True">
             <event-name>SubscriptionNotificationsAnswer</event-name>
             <event-type-ref>
<event-type-name>net.java.slee.resource.diameter.sh.events.SubscribeNotificationsAnswer</event-type-name>

Reply via email to