LTE Location Services: SLh and SLg interfaces implementation

.gitignore

@@ -17,7 +17,6 @@
 # Maven #
 #########
 target
-\$\{env.JBOSS_HOME\}
 
 # OS generated files #
 ######################

core/jdiameter-ha/api/pom.xml

@@ -20,8 +20,6 @@
     </dependency>
 
     <!-- clustering deps -->
-    <!-- JBoss 5: JBoss Cache -->
-    <!--
     <dependency>
       <groupId>org.jboss.cache</groupId>
       <artifactId>jbosscache-core</artifactId>
@@ -32,24 +30,9 @@
       <groupId>org.jboss.cluster</groupId>
       <artifactId>jboss-ha-server-cache-jbc</artifactId>
     </dependency>
-    -->
 
-    <!-- WildFly: Infinispan Cache -->
-    <!--
     <dependency>
-      <groupId>org.infinispan</groupId>
-      <artifactId>infinispan-core</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.infinispan</groupId>
-      <artifactId>infinispan-tree</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    -->
-
-    <dependency>
-      <groupId>org.restcomm.cluster</groupId>
+      <groupId>org.mobicents.cluster</groupId>
       <artifactId>timers</artifactId>
     </dependency>
   </dependencies>

core/jdiameter-ha/impl/pom.xml

@@ -25,33 +25,26 @@
       <artifactId>jdiameter-impl</artifactId>
     </dependency>
 
-    <!-- javax.transaction dependency -->
-    <!-- works for JBoss 5.1 -->
+    <!--  cache  -->
     <dependency>
-      <groupId>org.jboss.cluster</groupId>
-      <artifactId>jboss-ha-server-cache-jbc</artifactId>
+      <groupId>org.jboss.logging</groupId>
+      <artifactId>jboss-logging-log4j</artifactId>
+      <scope>provided</scope>
     </dependency>
 
-    <!--
+    <!-- clustering deps -->
     <dependency>
-      <groupId>javax</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>6.0</version>
-    </dependency>
-    -->
-
-    <dependency>
-      <groupId>org.restcomm.cluster</groupId>
-      <artifactId>core</artifactId>
+      <groupId>org.jboss.cluster</groupId>
+      <artifactId>jboss-ha-server-cache-jbc</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.restcomm.cluster</groupId>
+      <groupId>org.mobicents.cluster</groupId>
       <artifactId>cache</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.restcomm.cluster</groupId>
+      <groupId>org.mobicents.cluster</groupId>
       <artifactId>timers</artifactId>
     </dependency>
   </dependencies>

core/jdiameter-ha/impl/src/main/java/org/mobicents/diameter/impl/ha/client/acc/ClientAccSessionDataReplicatedImpl.java

@@ -45,7 +45,7 @@
 import java.io.Serializable;
 import java.nio.ByteBuffer;
 
-import org.restcomm.cache.FqnWrapper;
+import org.jboss.cache.Fqn;
 import org.jdiameter.api.AvpDataException;
 import org.jdiameter.api.Request;
 import org.jdiameter.api.acc.ClientAccSession;
@@ -55,7 +55,7 @@
 import org.jdiameter.client.api.parser.ParseException;
 import org.jdiameter.client.impl.app.acc.IClientAccSessionData;
 import org.jdiameter.common.api.app.acc.ClientAccSessionState;
-import org.restcomm.cluster.MobicentsCluster;
+import org.mobicents.cluster.MobicentsCluster;
 import org.mobicents.diameter.impl.ha.common.AppSessionDataReplicatedImpl;
 import org.mobicents.diameter.impl.ha.data.ReplicatedSessionDatasource;
 import org.slf4j.Logger;
@@ -79,12 +79,12 @@ public class ClientAccSessionDataReplicatedImpl extends AppSessionDataReplicated
   private IMessageParser messageParser;
 
   /**
-   * @param nodeFqnWrapper
+   * @param nodeFqn
    * @param mobicentsCluster
-   * @param container
+   * @param iface
    */
-  public ClientAccSessionDataReplicatedImpl(FqnWrapper nodeFqnWrapper, MobicentsCluster mobicentsCluster, IContainer container) {
-    super(nodeFqnWrapper, mobicentsCluster);
+  public ClientAccSessionDataReplicatedImpl(Fqn<?> nodeFqn, MobicentsCluster mobicentsCluster, IContainer container) {
+    super(nodeFqn, mobicentsCluster);
 
     if (super.create()) {
       setAppSessionIface(this, ClientAccSession.class);
@@ -97,13 +97,10 @@ public ClientAccSessionDataReplicatedImpl(FqnWrapper nodeFqnWrapper, MobicentsCl
   /**
    * @param sessionId
    * @param mobicentsCluster
-   * @param container
+   * @param iface
    */
   public ClientAccSessionDataReplicatedImpl(String sessionId, MobicentsCluster mobicentsCluster, IContainer container) {
-    this(
-      FqnWrapper.fromRelativeElementsWrapper(ReplicatedSessionDatasource.SESSIONS_FQN, sessionId),
-      mobicentsCluster, container
-    );
+    this(Fqn.fromRelativeElements(ReplicatedSessionDatasource.SESSIONS_FQN, sessionId), mobicentsCluster, container);
   }
 
   /*
@@ -115,7 +112,7 @@ public ClientAccSessionDataReplicatedImpl(String sessionId, MobicentsCluster mob
   @Override
   public void setClientAccSessionState(ClientAccSessionState state) {
     if (exists()) {
-      putNodeValue(STATE, state);
+      getNode().put(STATE, state);
     }
     else {
       throw new IllegalStateException();
@@ -130,7 +127,7 @@ public void setClientAccSessionState(ClientAccSessionState state) {
   @Override
   public ClientAccSessionState getClientAccSessionState() {
     if (exists()) {
-      return (ClientAccSessionState) getNodeValue(STATE);
+      return (ClientAccSessionState) getNode().get(STATE);
     }
     else {
       throw new IllegalStateException();
@@ -145,7 +142,7 @@ public ClientAccSessionState getClientAccSessionState() {
   @Override
   public void setInterimTimerId(Serializable tid) {
     if (exists()) {
-      putNodeValue(INTERIM_TIMERID, tid);
+      getNode().put(INTERIM_TIMERID, tid);
     }
     else {
       throw new IllegalStateException();
@@ -160,7 +157,7 @@ public void setInterimTimerId(Serializable tid) {
   @Override
   public Serializable getInterimTimerId() {
     if (exists()) {
-      return (Serializable) getNodeValue(INTERIM_TIMERID);
+      return (Serializable) getNode().get(INTERIM_TIMERID);
     }
     else {
       throw new IllegalStateException();
@@ -175,7 +172,7 @@ public Serializable getInterimTimerId() {
   @Override
   public void setDestinationHost(String destHost) {
     if (exists()) {
-      putNodeValue(DEST_HOST, destHost);
+      getNode().put(DEST_HOST, destHost);
     }
     else {
       throw new IllegalStateException();
@@ -190,7 +187,7 @@ public void setDestinationHost(String destHost) {
   @Override
   public String getDestinationHost() {
     if (exists()) {
-      return (String) getNodeValue(DEST_HOST);
+      return (String) getNode().get(DEST_HOST);
     }
     else {
       throw new IllegalStateException();
@@ -205,7 +202,7 @@ public String getDestinationHost() {
   @Override
   public void setDestinationRealm(String destRealm) {
     if (exists()) {
-      putNodeValue(DEST_REALM, destRealm);
+      getNode().put(DEST_REALM, destRealm);
     }
     else {
       throw new IllegalStateException();
@@ -220,7 +217,7 @@ public void setDestinationRealm(String destRealm) {
   @Override
   public String getDestinationRealm() {
     if (exists()) {
-      return (String) getNodeValue(DEST_REALM);
+      return (String) getNode().get(DEST_REALM);
     }
     else {
       throw new IllegalStateException();
@@ -229,7 +226,7 @@ public String getDestinationRealm() {
 
   @Override
   public Request getBuffer() {
-    byte[] data = (byte[]) getNodeValue(BUFFER);
+    byte[] data = (byte[]) getNode().get(BUFFER);
     if (data != null) {
       try {
         return this.messageParser.createMessage(ByteBuffer.wrap(data));
@@ -249,14 +246,14 @@ public void setBuffer(Request buffer) {
     if (buffer != null) {
       try {
         byte[] data = this.messageParser.encodeMessage((IMessage) buffer).array();
-        putNodeValue(BUFFER, data);
+        getNode().put(BUFFER, data);
       }
       catch (ParseException e) {
         logger.error("Unable to encode message to buffer.");
       }
     }
     else {
-      removeNodeValue(BUFFER);
+      getNode().remove(BUFFER);
     }
   }
 

core/jdiameter-ha/impl/src/main/java/org/mobicents/diameter/impl/ha/client/auth/ClientAuthSessionDataReplicatedImpl.java

@@ -44,11 +44,11 @@
 
 import java.io.Serializable;
 
-import org.restcomm.cache.FqnWrapper;
+import org.jboss.cache.Fqn;
 import org.jdiameter.api.auth.ClientAuthSession;
 import org.jdiameter.client.impl.app.auth.IClientAuthSessionData;
 import org.jdiameter.common.api.app.auth.ClientAuthSessionState;
-import org.restcomm.cluster.MobicentsCluster;
+import org.mobicents.cluster.MobicentsCluster;
 import org.mobicents.diameter.impl.ha.common.AppSessionDataReplicatedImpl;
 import org.mobicents.diameter.impl.ha.data.ReplicatedSessionDatasource;
 
@@ -66,11 +66,12 @@ public class ClientAuthSessionDataReplicatedImpl extends AppSessionDataReplicate
   private static final String TS_TIMERID = "TS_TIMERID";
 
   /**
-   * @param nodeFqnWrapper
+   * @param nodeFqn
    * @param mobicentsCluster
+   * @param iface
    */
-  public ClientAuthSessionDataReplicatedImpl(FqnWrapper nodeFqnWrapper, MobicentsCluster mobicentsCluster) {
-    super(nodeFqnWrapper, mobicentsCluster);
+  public ClientAuthSessionDataReplicatedImpl(Fqn<?> nodeFqn, MobicentsCluster mobicentsCluster) {
+    super(nodeFqn, mobicentsCluster);
 
     if (super.create()) {
       setAppSessionIface(this, ClientAuthSession.class);
@@ -81,12 +82,10 @@ public ClientAuthSessionDataReplicatedImpl(FqnWrapper nodeFqnWrapper, MobicentsC
   /**
    * @param sessionId
    * @param mobicentsCluster
+   * @param iface
    */
   public ClientAuthSessionDataReplicatedImpl(String sessionId, MobicentsCluster mobicentsCluster) {
-    this(
-      FqnWrapper.fromRelativeElementsWrapper(ReplicatedSessionDatasource.SESSIONS_FQN, sessionId),
-      mobicentsCluster
-    );
+    this(Fqn.fromRelativeElements(ReplicatedSessionDatasource.SESSIONS_FQN, sessionId), mobicentsCluster);
   }
 
   /*
@@ -98,7 +97,7 @@ public ClientAuthSessionDataReplicatedImpl(String sessionId, MobicentsCluster mo
   @Override
   public void setClientAuthSessionState(ClientAuthSessionState state) {
     if (exists()) {
-      putNodeValue(STATE, state);
+      getNode().put(STATE, state);
     }
     else {
       throw new IllegalStateException();
@@ -113,7 +112,7 @@ public void setClientAuthSessionState(ClientAuthSessionState state) {
   @Override
   public ClientAuthSessionState getClientAuthSessionState() {
     if (exists()) {
-      return (ClientAuthSessionState) getNodeValue(STATE);
+      return (ClientAuthSessionState) getNode().get(STATE);
     }
     else {
       throw new IllegalStateException();
@@ -128,7 +127,7 @@ public ClientAuthSessionState getClientAuthSessionState() {
   @Override
   public boolean isStateless() {
     if (exists()) {
-      return toPrimitive((Boolean) getNodeValue(STATELESS), true);
+      return toPrimitive((Boolean) getNode().get(STATELESS), true);
     }
     else {
       throw new IllegalStateException();
@@ -143,7 +142,7 @@ public boolean isStateless() {
   @Override
   public void setStateless(boolean b) {
     if (exists()) {
-      putNodeValue(STATELESS, b);
+      getNode().put(STATELESS, b);
     }
     else {
       throw new IllegalStateException();
@@ -159,7 +158,7 @@ public void setStateless(boolean b) {
   @Override
   public String getDestinationHost() {
     if (exists()) {
-      return (String) getNodeValue(DESTINATION_HOST);
+      return (String) getNode().get(DESTINATION_HOST);
     }
     else {
       throw new IllegalStateException();
@@ -174,7 +173,7 @@ public String getDestinationHost() {
   @Override
   public void setDestinationHost(String host) {
     if (exists()) {
-      putNodeValue(DESTINATION_HOST, host);
+      getNode().put(DESTINATION_HOST, host);
     }
     else {
       throw new IllegalStateException();
@@ -189,7 +188,7 @@ public void setDestinationHost(String host) {
   @Override
   public String getDestinationRealm() {
     if (exists()) {
-      return (String) getNodeValue(DESTINATION_REALM);
+      return (String) getNode().get(DESTINATION_REALM);
     }
     else {
       throw new IllegalStateException();
@@ -204,7 +203,7 @@ public String getDestinationRealm() {
   @Override
   public void setDestinationRealm(String realm) {
     if (exists()) {
-      putNodeValue(DESTINATION_REALM, realm);
+      getNode().put(DESTINATION_REALM, realm);
     }
     else {
       throw new IllegalStateException();
@@ -219,7 +218,7 @@ public void setDestinationRealm(String realm) {
   @Override
   public Serializable getTsTimerId() {
     if (exists()) {
-      return (Serializable) getNodeValue(TS_TIMERID);
+      return (Serializable) getNode().get(TS_TIMERID);
     }
     else {
       throw new IllegalStateException();
@@ -234,7 +233,7 @@ public Serializable getTsTimerId() {
   @Override
   public void setTsTimerId(Serializable tid) {
     if (exists()) {
-      putNodeValue(TS_TIMERID, tid);
+      getNode().put(TS_TIMERID, tid);
     }
     else {
       throw new IllegalStateException();