Revision: 16236
Author: brainslog
Date: Fri Jan  7 03:06:33 2011
Log: Updating IMS User Profile Enabler
http://code.google.com/p/mobicents/source/detail?r=16236

Modified:
/trunk/servers/jain-slee/enablers/ims-user-profile/docs/sources/src/main/resources/en-US/Chapter-Using_The_Enabler.xml /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/IMSUserProfileParent.java

=======================================
--- /trunk/servers/jain-slee/enablers/ims-user-profile/docs/sources/src/main/resources/en-US/Chapter-Using_The_Enabler.xml Thu Jan 6 13:29:47 2011 +++ /trunk/servers/jain-slee/enablers/ims-user-profile/docs/sources/src/main/resources/en-US/Chapter-Using_The_Enabler.xml Fri Jan 7 03:06:33 2011
@@ -29,7 +29,7 @@

// Sh-Pull Operations -------------------------------------------------------

- public String getRepositoryData(String publicIdentity, byte[][] serviceIndication) + public String getRepositoryData(String publicIdentity, byte[][] serviceIndications)
             throws IOException;

public String getIMSPublicIdentity(String publicIdentity, byte[] msisdn, int identitySet)
@@ -60,7 +60,7 @@

// Sh-Subscribe Operations --------------------------------------------------

- public String subscribeRepositoryData(String publicIdentity, byte[][] serviceIndication, + public String subscribeRepositoryData(String publicIdentity, byte[][] serviceIndications,
             int subscriptionRequestType) throws IOException;

public String subscribeIMSUserState(String publicIdentity, int subscriptionRequestType)
=======================================
--- /trunk/servers/jain-slee/enablers/ims-user-profile/sbb/src/main/java/org/mobicents/slee/enabler/ims/userprofile/IMSUserProfileChildSbb.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/IMSUserProfileChildSbb.java Fri Jan 7 03:06:33 2011
@@ -90,7 +90,11 @@

     ShClientActivity activity = getShClientActivity();
     activity.sendUserDataRequest(udr);
-
+
+    // Store request for future matching
+    storeRequestInACI(activity, udr);
+
+    // Return Session-Id, may be used as identifier
     return activity.getSessionId();
   }

@@ -103,6 +107,10 @@
     ShClientActivity activity = getShClientActivity();
     activity.sendUserDataRequest(udr);

+    // Store request for future matching
+    storeRequestInACI(activity, udr);
+
+    // Return Session-Id, may be used as identifier
     return activity.getSessionId();
   }

@@ -114,6 +122,10 @@
     ShClientActivity activity = getShClientActivity();
     activity.sendUserDataRequest(udr);

+    // Store request for future matching
+    storeRequestInACI(activity, udr);
+
+    // Return Session-Id, may be used as identifier
     return activity.getSessionId();
   }

@@ -125,6 +137,10 @@
     ShClientActivity activity = getShClientActivity();
     activity.sendUserDataRequest(udr);

+    // Store request for future matching
+    storeRequestInACI(activity, udr);
+
+    // Return Session-Id, may be used as identifier
     return activity.getSessionId();
   }

@@ -137,6 +153,10 @@
     ShClientActivity activity = getShClientActivity();
     activity.sendUserDataRequest(udr);

+    // Store request for future matching
+    storeRequestInACI(activity, udr);
+
+    // Return Session-Id, may be used as identifier
     return activity.getSessionId();
   }

@@ -149,6 +169,10 @@
     ShClientActivity activity = getShClientActivity();
     activity.sendUserDataRequest(udr);

+    // Store request for future matching
+    storeRequestInACI(activity, udr);
+
+    // Return Session-Id, may be used as identifier
     return activity.getSessionId();
   }

@@ -161,6 +185,10 @@
     ShClientActivity activity = getShClientActivity();
     activity.sendUserDataRequest(udr);

+    // Store request for future matching
+    storeRequestInACI(activity, udr);
+
+    // Return Session-Id, may be used as identifier
     return activity.getSessionId();
   }

@@ -172,6 +200,10 @@
     ShClientActivity activity = getShClientActivity();
     activity.sendUserDataRequest(udr);

+    // Store request for future matching
+    storeRequestInACI(activity, udr);
+
+    // Return Session-Id, may be used as identifier
     return activity.getSessionId();
   }

@@ -183,6 +215,10 @@
     ShClientActivity activity = getShClientActivity();
     activity.sendUserDataRequest(udr);

+    // Store request for future matching
+    storeRequestInACI(activity, udr);
+
+    // Return Session-Id, may be used as identifier
     return activity.getSessionId();
   }

@@ -194,9 +230,137 @@
     ShClientActivity activity = getShClientActivity();
     activity.sendUserDataRequest(udr);

+    // Store request for future matching
+    storeRequestInACI(activity, udr);
+
+    // Return Session-Id, may be used as identifier
     return activity.getSessionId();
   }

+ public String updateRepositoryData(String publicIdentity, ShData data) throws IOException { + UserIdentityAvp publicIdentityAvp = createUserIdentityAvp(publicIdentity, null);
+
+ // Constructor does not allow to use ShData directly, using empty and filling separately + ProfileUpdateRequest pur = diameterShClientMessageFactory.createProfileUpdateRequest();
+
+    pur.setUserIdentity(publicIdentityAvp);
+    pur.setDataReference(DataReferenceType.REPOSITORY_DATA);
+    pur.setUserDataObject(data);
+
+    ShClientActivity activity = getShClientActivity();
+    activity.sendProfileUpdateRequest(pur);
+
+    // Store request for future matching
+    storeRequestInACI(activity, pur);
+
+    // Return Session-Id, may be used as identifier
+    return activity.getSessionId();
+  }
+
+ public String updatePSIActivation(String publicIdentity, ShData data) throws IOException { + UserIdentityAvp publicIdentityAvp = createUserIdentityAvp(publicIdentity, null);
+
+ // Constructor does not allow to use ShData directly, using empty and filling separately + ProfileUpdateRequest pur = diameterShClientMessageFactory.createProfileUpdateRequest();
+
+    pur.setUserIdentity(publicIdentityAvp);
+    pur.setDataReference(DataReferenceType.PSI_ACTIVATION);
+    pur.setUserDataObject(data);
+
+    ShClientActivity activity = getShClientActivity();
+    activity.sendProfileUpdateRequest(pur);
+
+    // Store request for future matching
+    storeRequestInACI(activity, pur);
+
+    // Return Session-Id, may be used as identifier
+    return activity.getSessionId();
+  }
+
+ public String subscribeRepositoryData(String publicIdentity, byte[][] serviceIndications, int subscriptionRequestType) throws IOException { + UserIdentityAvp publicIdentityAvp = createUserIdentityAvp(publicIdentity, null);
+
+ SubscribeNotificationsRequest snr = diameterShClientMessageFactory.createSubscribeNotificationsRequest(publicIdentityAvp, DataReferenceType.REPOSITORY_DATA, SubsReqType.fromInt(subscriptionRequestType));
+
+    // hack.. to be fixed in Resource Adaptor
+ String[] serviceIndicationStrings = new String[serviceIndications.length];
+    for (int i = 0; i < serviceIndications.length; i++) {
+      serviceIndicationStrings[i] = new String(serviceIndications[i]);
+    }
+
+    snr.setServiceIndications(serviceIndicationStrings);
+
+    ShClientActivity activity = getShClientActivity();
+    activity.sendSubscribeNotificationsRequest(snr);
+
+    // Store request for future matching
+    storeRequestInACI(activity, snr);
+
+    // Return Session-Id, may be used as identifier
+    return activity.getSessionId();
+  }
+
+ public String subscribeIMSUserState(String publicIdentity, int subscriptionRequestType) throws IOException { + UserIdentityAvp publicIdentityAvp = createUserIdentityAvp(publicIdentity, null);
+
+ SubscribeNotificationsRequest snr = diameterShClientMessageFactory.createSubscribeNotificationsRequest(publicIdentityAvp, DataReferenceType.IMS_USER_STATE, SubsReqType.fromInt(subscriptionRequestType));
+
+    ShClientActivity activity = getShClientActivity();
+    activity.sendSubscribeNotificationsRequest(snr);
+
+    // Store request for future matching
+    storeRequestInACI(activity, snr);
+
+    // Return Session-Id, may be used as identifier
+    return activity.getSessionId();
+  }
+
+ public String subscribeSCSCFName(String publicIdentity, int subscriptionRequestType) throws IOException { + UserIdentityAvp publicIdentityAvp = createUserIdentityAvp(publicIdentity, null);
+
+ SubscribeNotificationsRequest snr = diameterShClientMessageFactory.createSubscribeNotificationsRequest(publicIdentityAvp, DataReferenceType.S_CSCFNAME, SubsReqType.fromInt(subscriptionRequestType));
+
+    ShClientActivity activity = getShClientActivity();
+    activity.sendSubscribeNotificationsRequest(snr);
+
+    // Store request for future matching
+    storeRequestInACI(activity, snr);
+
+    // Return Session-Id, may be used as identifier
+    return activity.getSessionId();
+  }
+
+ public String subscribeInitialFilterCriteria(String publicIdentity, String serverName, int subscriptionRequestType) throws IOException { + UserIdentityAvp publicIdentityAvp = createUserIdentityAvp(publicIdentity, null);
+
+ SubscribeNotificationsRequest snr = diameterShClientMessageFactory.createSubscribeNotificationsRequest(publicIdentityAvp, DataReferenceType.INITIAL_FILTER_CRITERIA, SubsReqType.fromInt(subscriptionRequestType));
+    snr.setServerName(serverName);
+
+    ShClientActivity activity = getShClientActivity();
+    activity.sendSubscribeNotificationsRequest(snr);
+
+    // Store request for future matching
+    storeRequestInACI(activity, snr);
+
+    // Return Session-Id, may be used as identifier
+    return activity.getSessionId();
+  }
+
+ public String subscribePSIActivation(String publicIdentity, int subscriptionRequestType) throws IOException { + UserIdentityAvp publicIdentityAvp = createUserIdentityAvp(publicIdentity, null);
+
+ SubscribeNotificationsRequest snr = diameterShClientMessageFactory.createSubscribeNotificationsRequest(publicIdentityAvp, DataReferenceType.PSI_ACTIVATION, SubsReqType.fromInt(subscriptionRequestType));
+
+    ShClientActivity activity = getShClientActivity();
+    activity.sendSubscribeNotificationsRequest(snr);
+
+    // Store request for future matching
+    storeRequestInACI(activity, snr);
+
+    // Return Session-Id, may be used as identifier
+    return activity.getSessionId();
+  }
+
// -- HELPER METHODS --------------------------------------------------------

private UserIdentityAvp createUserIdentityAvp(String publicIdentity, byte[] msisdn) {
@@ -255,6 +419,13 @@
       throw new IOException(e.getMessage(), e);
     }
   }
+
+ private void storeRequestInACI(ShClientActivity activity, DiameterShMessage message) { + ActivityContextInterface aci = diameterShClientACIF.getActivityContextInterface(activity);
+    RequestMappingACI rmACI = asSbbActivityContextInterface(aci);
+
+    rmACI.setRequest(message);
+  }

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

=======================================
--- /trunk/servers/jain-slee/enablers/ims-user-profile/sbb/src/main/java/org/mobicents/slee/enabler/ims/userprofile/IMSUserProfileParent.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/IMSUserProfileParent.java Fri Jan 7 03:06:33 2011
@@ -60,7 +60,7 @@

// Sh-Subscribe Operations Callbacks ----------------------------------------

- public String subscribeRepositoryDataResponse(String publicIdentity, byte[][] serviceIndication, int subscriptionRequestType, long resultCode); + public String subscribeRepositoryDataResponse(String publicIdentity, byte[][] serviceIndications, int subscriptionRequestType, long resultCode);

public String subscribeIMSUserStateResponse(String publicIdentity, int subscriptionRequestType, long resultCode);

Reply via email to