3 new revisions:

Revision: 7cb81eef0707
Author:   Sergey Vetyutnev <[email protected]>
Date:     Wed Aug  8 06:30:23 2012
Log:      CAP community update 08082012
http://code.google.com/p/jss7/source/detail?r=7cb81eef0707

Revision: 480ade980ce2
Author:   Sergey Vetyutnev <[email protected]>
Date:     Wed Aug  8 10:56:21 2012
Log: CAP community update: CalledPartyBCDNumber and OAbandonSpecificInfo
http://code.google.com/p/jss7/source/detail?r=480ade980ce2

Revision: 5a56d3fc428b
Author:   Sergey Vetyutnev <[email protected]>
Date:     Wed Aug  8 10:59:07 2012
Log:      Merge branch 'map8'
http://code.google.com/p/jss7/source/detail?r=5a56d3fc428b

==============================================================================
Revision: 7cb81eef0707
Author:   Sergey Vetyutnev <[email protected]>
Date:     Wed Aug  8 06:30:23 2012
Log:      CAP community update 08082012
http://code.google.com/p/jss7/source/detail?r=7cb81eef0707

Added:
/cap/cap-impl/src/main/java/org/mobicents/protocols/ss7/cap/EsiBcsm/OAbandonSpecificInfoImpl.java /cap/cap-impl/src/main/java/org/mobicents/protocols/ss7/cap/primitives/OctetStringBase.java
Modified:
/cap/cap-api/src/main/java/org/mobicents/protocols/ss7/cap/api/CAPParameterFactory.java /cap/cap-api/src/main/java/org/mobicents/protocols/ss7/cap/api/CAPProvider.java /cap/cap-api/src/main/java/org/mobicents/protocols/ss7/cap/api/primitives/CalledPartyBCDNumber.java /cap/cap-impl/src/main/java/org/mobicents/protocols/ss7/cap/CAPParameterFactoryImpl.java /cap/cap-impl/src/main/java/org/mobicents/protocols/ss7/cap/CAPProviderImpl.java /cap/cap-impl/src/main/java/org/mobicents/protocols/ss7/cap/primitives/CalledPartyBCDNumberImpl.java /cap/cap-impl/src/main/java/org/mobicents/protocols/ss7/cap/service/circuitSwitchedCall/primitive/EventSpecificInformationBCSMImpl.java /cap/cap-impl/src/test/java/org/mobicents/protocols/ss7/cap/primitives/CalledPartyBCDNumberTest.java

=======================================
--- /dev/null
+++ /cap/cap-impl/src/main/java/org/mobicents/protocols/ss7/cap/EsiBcsm/OAbandonSpecificInfoImpl.java Wed Aug 8 06:30:23 2012
@@ -0,0 +1,197 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2011, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.mobicents.protocols.ss7.cap.EsiBcsm;
+
+import java.io.IOException;
+
+import org.mobicents.protocols.asn.AsnException;
+import org.mobicents.protocols.asn.AsnInputStream;
+import org.mobicents.protocols.asn.AsnOutputStream;
+import org.mobicents.protocols.asn.Tag;
+import org.mobicents.protocols.ss7.cap.api.CAPException;
+import org.mobicents.protocols.ss7.cap.api.CAPParsingComponentException;
+import org.mobicents.protocols.ss7.cap.api.CAPParsingComponentExceptionReason;
+import org.mobicents.protocols.ss7.cap.api.EsiBcsm.OAbandonSpecificInfo;
+import org.mobicents.protocols.ss7.cap.api.EsiBcsm.TNoAnswerSpecificInfo;
+import org.mobicents.protocols.ss7.cap.api.isup.CalledPartyNumberCap;
+import org.mobicents.protocols.ss7.cap.isup.CalledPartyNumberCapImpl;
+import org.mobicents.protocols.ss7.cap.primitives.CAPAsnPrimitive;
+import org.mobicents.protocols.ss7.map.api.MAPParsingComponentException;
+
+/**
+ *
+ * @author sergey vetyutnev
+ *
+ */
+public class OAbandonSpecificInfoImpl implements OAbandonSpecificInfo, CAPAsnPrimitive {
+
+       public static final int _ID_routeNotPermitted = 50;
+
+       public static final String _PrimitiveName = "OAbandonSpecificInfo";
+       private boolean routeNotPermitted;
+
+
+       public OAbandonSpecificInfoImpl() {
+       }
+
+       public OAbandonSpecificInfoImpl(boolean routeNotPermitted) {
+               this.routeNotPermitted=routeNotPermitted;
+       }
+
+       @Override
+       public int getTag() throws CAPException {
+               return Tag.SEQUENCE;
+       }
+
+       @Override
+       public int getTagClass() {
+               return Tag.CLASS_UNIVERSAL;
+       }
+
+       @Override
+       public boolean getIsPrimitive() {
+               return false;
+       }
+
+
+       @Override
+ public void decodeAll(AsnInputStream ansIS) throws CAPParsingComponentException {
+
+               try {
+                       int length = ansIS.readLength();
+                       this._decode(ansIS, length);
+               } catch (IOException e) {
+ throw new CAPParsingComponentException("IOException when decoding " + _PrimitiveName + ": " + e.getMessage(), e,
+                                       
CAPParsingComponentExceptionReason.MistypedParameter);
+               } catch (AsnException e) {
+ throw new CAPParsingComponentException("AsnException when decoding " + _PrimitiveName + ": " + e.getMessage(), e,
+                                       
CAPParsingComponentExceptionReason.MistypedParameter);
+               } catch (MAPParsingComponentException e) {
+ throw new CAPParsingComponentException("MAPParsingComponentException when decoding " + _PrimitiveName + ": " + e.getMessage(), e,
+                                       
CAPParsingComponentExceptionReason.MistypedParameter);
+               }
+       }
+
+       @Override
+ public void decodeData(AsnInputStream ansIS, int length) throws CAPParsingComponentException {
+
+               try {
+                       this._decode(ansIS, length);
+               } catch (IOException e) {
+ throw new CAPParsingComponentException("IOException when decoding " + _PrimitiveName + ": " + e.getMessage(), e,
+                                       
CAPParsingComponentExceptionReason.MistypedParameter);
+               } catch (AsnException e) {
+ throw new CAPParsingComponentException("AsnException when decoding " + _PrimitiveName + ": " + e.getMessage(), e,
+                                       
CAPParsingComponentExceptionReason.MistypedParameter);
+               } catch (MAPParsingComponentException e) {
+ throw new CAPParsingComponentException("MAPParsingComponentException when decoding " + _PrimitiveName + ": " + e.getMessage(), e,
+                                       
CAPParsingComponentExceptionReason.MistypedParameter);
+               }
+       }
+
+ private void _decode(AsnInputStream ansIS, int length) throws CAPParsingComponentException, MAPParsingComponentException, IOException, AsnException {
+
+               this.routeNotPermitted = false;
+
+               AsnInputStream ais = ansIS.readSequenceStreamData(length);
+               while (true) {
+                       if (ais.available() == 0)
+                               break;
+
+                       int tag = ais.readTag();
+
+                       if (ais.getTagClass() == Tag.CLASS_CONTEXT_SPECIFIC) {
+                               switch (tag) {
+                               case _ID_routeNotPermitted:
+                                       ais.readNull();
+                                       this.routeNotPermitted = true;
+                                       break;
+
+                               default:
+                                       ais.advanceElement();
+                                       break;
+                               }
+                       } else {
+                               ais.advanceElement();
+                       }
+               }
+       }
+
+       @Override
+       public void encodeAll(AsnOutputStream asnOs) throws CAPException {
+               this.encodeAll(asnOs, Tag.CLASS_UNIVERSAL, Tag.SEQUENCE);
+       }
+
+       @Override
+ public void encodeAll(AsnOutputStream asnOs, int tagClass, int tag) throws CAPException {
+
+               try {
+                       asnOs.writeTag(tagClass, false, tag);
+                       int pos = asnOs.StartContentDefiniteLength();
+                       this.encodeData(asnOs);
+                       asnOs.FinalizeContent(pos);
+               } catch (AsnException e) {
+ throw new CAPException("AsnException when encoding " + _PrimitiveName + ": " + e.getMessage(), e);
+               }
+       }
+
+       @Override
+       public void encodeData(AsnOutputStream asnOs) throws CAPException {
+
+               try {
+                       if (this.routeNotPermitted)
+                               asnOs.writeNull(Tag.CLASS_CONTEXT_SPECIFIC, 
_ID_routeNotPermitted);
+               } catch (IOException e) {
+ throw new CAPException("IOException when encoding " + _PrimitiveName + ": " + e.getMessage(), e);
+               } catch (AsnException e) {
+ throw new CAPException("AsnException when encoding " + _PrimitiveName + ": " + e.getMessage(), e);
+               }
+       }
+
+       @Override
+       public String toString() {
+
+               StringBuilder sb = new StringBuilder();
+               sb.append(_PrimitiveName);
+               sb.append(" [");
+
+               if (this.routeNotPermitted) {
+                       sb.append("routeNotPermitted");
+               }
+
+
+               sb.append("]");
+
+               return sb.toString();
+       }
+
+       @Override
+       public boolean getRouteNotPermitted() {
+               return routeNotPermitted;
+       }
+
+       public void  setRouteNotPermitted(boolean newValue) {
+               routeNotPermitted=newValue;
+       }
+}
+
=======================================
--- /dev/null
+++ /cap/cap-impl/src/main/java/org/mobicents/protocols/ss7/cap/primitives/OctetStringBase.java Wed Aug 8 06:30:23 2012
@@ -0,0 +1,190 @@
+/*
+ * TeleStax, Open Source Cloud Communications  Copyright 2012.
+ * and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.mobicents.protocols.ss7.cap.primitives;
+
+import java.io.IOException;
+import java.util.Arrays;
+import org.mobicents.protocols.asn.AsnException;
+import org.mobicents.protocols.asn.AsnInputStream;
+import org.mobicents.protocols.asn.AsnOutputStream;
+import org.mobicents.protocols.asn.Tag;
+import org.mobicents.protocols.ss7.cap.api.CAPException;
+import org.mobicents.protocols.ss7.cap.api.CAPParsingComponentException;
+import org.mobicents.protocols.ss7.cap.api.CAPParsingComponentExceptionReason;
+
+
+/**
+*
+* Super class for implementing primitives that are OCTET STRING (SIZE (x..y))
+*
+* @author sergey vetyutnev
+*
+*/
+public class OctetStringBase implements CAPAsnPrimitive {
+
+       protected byte[] data;
+
+       protected int minLength;
+       protected int maxLength;
+       protected String _PrimitiveName;
+
+ public OctetStringBase(int minLength, int maxLength, String _PrimitiveName) {
+               this.minLength = minLength;
+               this.maxLength = maxLength;
+               this._PrimitiveName = _PrimitiveName;
+       }
+
+ public OctetStringBase(int minLength, int maxLength, String _PrimitiveName, byte[] data) {
+               this(minLength, maxLength, _PrimitiveName);
+
+               this.data = data;
+       }
+
+
+       public int getTag() throws CAPException {
+               return Tag.STRING_OCTET;
+       }
+
+       public int getTagClass() {
+               return Tag.CLASS_UNIVERSAL;
+       }
+
+       public boolean getIsPrimitive() {
+               return true;
+       }
+
+       @Override
+ public void decodeAll(AsnInputStream ansIS) throws CAPParsingComponentException {
+
+               try {
+                       int length = ansIS.readLength();
+                       this._decode(ansIS, length);
+               } catch (IOException e) {
+ throw new CAPParsingComponentException("IOException when decoding " + _PrimitiveName + ": " + e.getMessage(), e,
+                                       
CAPParsingComponentExceptionReason.MistypedParameter);
+               }
+       }
+
+ public void decodeData(AsnInputStream ansIS, int length) throws CAPParsingComponentException {
+
+               try {
+                       this._decode(ansIS, length);
+               } catch (IOException e) {
+ throw new CAPParsingComponentException("IOException when decoding " + _PrimitiveName + ": " + e.getMessage(), e,
+                                       
CAPParsingComponentExceptionReason.MistypedParameter);
+               }
+       }
+
+ protected void _decode(AsnInputStream ansIS, int length) throws CAPParsingComponentException, IOException {
+
+               if (!ansIS.isTagPrimitive())
+ throw new CAPParsingComponentException("Error decoding " + _PrimitiveName + ": field must be primitive",
+                                       
CAPParsingComponentExceptionReason.MistypedParameter);
+
+               if (length < this.minLength || length > this.maxLength)
+ throw new CAPParsingComponentException("Error decoding " + _PrimitiveName + ": the field must contain from " + this.minLength + " to " + + this.maxLength + " octets. Contains: " + length, CAPParsingComponentExceptionReason.MistypedParameter);
+
+               data = new byte[length];
+               ansIS.read(data);
+       }
+
+       public void encodeAll(AsnOutputStream asnOs) throws CAPException {
+
+               this.encodeAll(asnOs, this.getTagClass(), this.getTag());
+       }
+
+ public void encodeAll(AsnOutputStream asnOs, int tagClass, int tag) throws CAPException {
+
+               try {
+                       asnOs.writeTag(tagClass, this.getIsPrimitive(), tag);
+                       int pos = asnOs.StartContentDefiniteLength();
+                       this.encodeData(asnOs);
+                       asnOs.FinalizeContent(pos);
+               } catch (AsnException e) {
+ throw new CAPException("AsnException when encoding " + _PrimitiveName + ": " + e.getMessage(), e);
+               }
+       }
+
+       public void encodeData(AsnOutputStream asnOs) throws CAPException {
+
+               if (this.data == null)
+ throw new CAPException("Error while encoding the " + _PrimitiveName + ": data is not defined");
+
+ if (this.data.length < this.minLength || this.data.length > this.maxLength) + throw new CAPException("Error while encoding the " + _PrimitiveName + ": data field length must be from " + this.minLength + " to "
+                                       + this.maxLength + " octets");
+
+               asnOs.write(this.data);
+       }
+
+       @Override
+       public int hashCode() {
+               if (data == null)
+                       return 0;
+
+               final int prime = 31;
+               int result = 1;
+               result = prime * result + Arrays.hashCode(data);
+               return result;
+       }
+
+       @Override
+       public boolean equals(Object obj) {
+               if (this == obj)
+                       return true;
+               if (obj == null)
+                       return false;
+               if (getClass() != obj.getClass())
+                       return false;
+               OctetStringBase other = (OctetStringBase) obj;
+               if (data == null) {
+                       if (other.data != null)
+                               return false;
+               } else if (!Arrays.equals(data, other.data))
+                       return false;
+               return true;
+       }
+
+       @Override
+       public String toString() {
+               return _PrimitiveName + " [Data= " + this.printDataArr() + "]";
+       }
+
+       protected String printDataArr() {
+               StringBuilder sb = new StringBuilder();
+               boolean first = true;
+               if (this.data != null) {
+                       for (int b : this.data) {
+                               if (first)
+                                       first = false;
+                               else
+                                       sb.append(", ");
+                               sb.append(b);
+                       }
+               }
+
+               return sb.toString();
+       }
+}
+
=======================================
--- /cap/cap-api/src/main/java/org/mobicents/protocols/ss7/cap/api/CAPParameterFactory.java Wed May 30 14:20:57 2012 +++ /cap/cap-api/src/main/java/org/mobicents/protocols/ss7/cap/api/CAPParameterFactory.java Wed Aug 8 06:30:23 2012
@@ -24,6 +24,7 @@

 import java.util.ArrayList;

+import org.mobicents.protocols.ss7.cap.EsiBcsm.OAbandonSpecificInfoImpl;
import org.mobicents.protocols.ss7.cap.api.EsiBcsm.CallAcceptedSpecificInfo;
 import org.mobicents.protocols.ss7.cap.api.EsiBcsm.ChargeIndicator;
 import org.mobicents.protocols.ss7.cap.api.EsiBcsm.OAbandonSpecificInfo;
@@ -188,6 +189,7 @@

public RouteSelectFailureSpecificInfo createRouteSelectFailureSpecificInfo(CauseCap failureCause); public OCalledPartyBusySpecificInfo createOCalledPartyBusySpecificInfo(CauseCap busyCause); + public OAbandonSpecificInfo createOAbandonSpecificInfo(boolean routeNotPermitted);
        public ONoAnswerSpecificInfo createONoAnswerSpecificInfo();
public OAnswerSpecificInfo createOAnswerSpecificInfo(CalledPartyNumberCap destinationAddress, boolean orCall, boolean forwardedCall, ChargeIndicator chargeIndicator, ExtBasicServiceCode extBasicServiceCode, ExtBasicServiceCode extBasicServiceCode2);
=======================================
--- /cap/cap-api/src/main/java/org/mobicents/protocols/ss7/cap/api/CAPProvider.java Sun Aug 5 10:23:27 2012 +++ /cap/cap-api/src/main/java/org/mobicents/protocols/ss7/cap/api/CAPProvider.java Wed Aug 8 06:30:23 2012
@@ -22,18 +22,19 @@

 package org.mobicents.protocols.ss7.cap.api;

+import java.io.Serializable;
+
 import org.mobicents.protocols.ss7.cap.api.errors.CAPErrorMessageFactory;
import org.mobicents.protocols.ss7.cap.api.service.circuitSwitchedCall.CAPServiceCircuitSwitchedCall;
 import org.mobicents.protocols.ss7.cap.api.service.gprs.CAPServiceGprs;
 import org.mobicents.protocols.ss7.cap.api.service.sms.CAPServiceSms;
-import org.mobicents.protocols.ss7.tcap.api.TCAPProvider;

 /**
  *
  * @author sergey vetyutnev
  *
  */
-public interface CAPProvider {
+public interface CAPProvider extends Serializable {

        /**
         * Add CAP Dialog listener to the Stack
=======================================
--- /cap/cap-api/src/main/java/org/mobicents/protocols/ss7/cap/api/primitives/CalledPartyBCDNumber.java Mon Apr 23 10:53:14 2012 +++ /cap/cap-api/src/main/java/org/mobicents/protocols/ss7/cap/api/primitives/CalledPartyBCDNumber.java Wed Aug 8 06:30:23 2012
@@ -22,8 +22,14 @@

 package org.mobicents.protocols.ss7.cap.api.primitives;

+import org.mobicents.protocols.ss7.map.api.primitives.AddressNature;
+import org.mobicents.protocols.ss7.map.api.primitives.AddressString;
+import org.mobicents.protocols.ss7.map.api.primitives.NumberingPlan;
+
+
 /**
-*
+ *
+
 CalledPartyBCDNumber {PARAMETERS-BOUND : bound} ::= OCTET STRING (SIZE(
bound.&minCalledPartyBCDNumberLength .. bound.&maxCalledPartyBCDNumberLength)) -- Indicates the Called Party Number, including service selection information.
@@ -38,15 +44,22 @@
 -- with 3GPP TS 23.040 [6]. The address is coded in accordance with the
 -- GSM 7-bit default alphabet definition and the SMS packing rules
 -- as specified in 3GPP TS 23.038 [15] in this case.
-*
-* @author sergey vetyutnev
-*
-*/
-public interface CalledPartyBCDNumber {
+
+minCalledPartyBCDNumberLength ::= 1
+maxCalledPartyBCDNumberLength ::= 41
+
+ *
+ * @author sergey vetyutnev
+ *
+ */
+public interface CalledPartyBCDNumber extends AddressString{

        public byte[] getData();

-       // TODO: implement "Called party BCD number" from 24.008 (Mobile radio
-       // interface Layer 3 specification; Core network protocols)
+       public AddressNature getAddressNature();
+
+       public NumberingPlan getNumberingPlan();
+
+       public String getAddress();

 }
=======================================
--- /cap/cap-impl/src/main/java/org/mobicents/protocols/ss7/cap/CAPParameterFactoryImpl.java Mon Aug 6 06:08:42 2012 +++ /cap/cap-impl/src/main/java/org/mobicents/protocols/ss7/cap/CAPParameterFactoryImpl.java Wed Aug 8 06:30:23 2012
@@ -24,6 +24,7 @@

 import java.util.ArrayList;

+import org.mobicents.protocols.ss7.cap.EsiBcsm.OAbandonSpecificInfoImpl;
 import org.mobicents.protocols.ss7.cap.EsiBcsm.OAnswerSpecificInfoImpl;
import org.mobicents.protocols.ss7.cap.EsiBcsm.OCalledPartyBusySpecificInfoImpl;
 import org.mobicents.protocols.ss7.cap.EsiBcsm.ODisconnectSpecificInfoImpl;
@@ -390,11 +391,18 @@
                return new OCalledPartyBusySpecificInfoImpl(busyCause);
        }

+       @Override
+ public OAbandonSpecificInfo createOAbandonSpecificInfo(boolean routeNotPermitted) {
+               return new OAbandonSpecificInfoImpl(routeNotPermitted);
+       }
+
        @Override
        public ONoAnswerSpecificInfo createONoAnswerSpecificInfo() {
                return new ONoAnswerSpecificInfoImpl();
        }

+
+
        @Override
public OAnswerSpecificInfo createOAnswerSpecificInfo(CalledPartyNumberCap destinationAddress, boolean orCall, boolean forwardedCall, ChargeIndicator chargeIndicator, ExtBasicServiceCode extBasicServiceCode, ExtBasicServiceCode extBasicServiceCode2) {
=======================================
--- /cap/cap-impl/src/main/java/org/mobicents/protocols/ss7/cap/CAPProviderImpl.java Sun Aug 5 10:23:27 2012 +++ /cap/cap-impl/src/main/java/org/mobicents/protocols/ss7/cap/CAPProviderImpl.java Wed Aug 8 06:30:23 2012
@@ -109,21 +109,21 @@
  */
 public class CAPProviderImpl implements CAPProvider, TCListener {

-       protected Logger loger = Logger.getLogger(CAPProviderImpl.class);
+ protected static final Logger loger = Logger.getLogger(CAPProviderImpl.class);

- private List<CAPDialogListener> dialogListeners = new CopyOnWriteArrayList<CAPDialogListener>(); + transient private List<CAPDialogListener> dialogListeners = new CopyOnWriteArrayList<CAPDialogListener>();

- protected Map<Long, CAPDialogImpl> dialogs = new HashMap<Long, CAPDialogImpl>(); + transient protected Map<Long, CAPDialogImpl> dialogs = new HashMap<Long, CAPDialogImpl>();

-       private TCAPProvider tcapProvider = null;
+       transient private TCAPProvider tcapProvider = null;

- private final CAPParameterFactory capParameterFactory = new CAPParameterFactoryImpl(); - private final CAPErrorMessageFactory capErrorMessageFactory = new CAPErrorMessageFactoryImpl(); + transient private final CAPParameterFactory capParameterFactory = new CAPParameterFactoryImpl(); + transient private final CAPErrorMessageFactory capErrorMessageFactory = new CAPErrorMessageFactoryImpl();

-       protected Set<CAPServiceBase> capServices = new 
HashSet<CAPServiceBase>();
- private final CAPServiceCircuitSwitchedCall capServiceCircuitSwitchedCall = new CAPServiceCircuitSwitchedCallImpl(this); - private final CAPServiceGprs capServiceGprs = new CAPServiceGprsImpl(this);
-       private final CAPServiceSms capServiceSms = new CAPServiceSmsImpl(this);
+ transient protected Set<CAPServiceBase> capServices = new HashSet<CAPServiceBase>(); + transient private final CAPServiceCircuitSwitchedCall capServiceCircuitSwitchedCall = new CAPServiceCircuitSwitchedCallImpl(this); + transient private final CAPServiceGprs capServiceGprs = new CAPServiceGprsImpl(this); + transient private final CAPServiceSms capServiceSms = new CAPServiceSmsImpl(this);


        public CAPProviderImpl(TCAPProvider tcapProvider) {
=======================================
--- /cap/cap-impl/src/main/java/org/mobicents/protocols/ss7/cap/primitives/CalledPartyBCDNumberImpl.java Mon Apr 23 10:53:14 2012 +++ /cap/cap-impl/src/main/java/org/mobicents/protocols/ss7/cap/primitives/CalledPartyBCDNumberImpl.java Wed Aug 8 06:30:23 2012
@@ -22,143 +22,279 @@

 package org.mobicents.protocols.ss7.cap.primitives;

+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;

-import org.mobicents.protocols.asn.AsnException;
-import org.mobicents.protocols.asn.AsnInputStream;
-import org.mobicents.protocols.asn.AsnOutputStream;
-import org.mobicents.protocols.asn.Tag;
+import javolution.xml.XMLFormat;
+import javolution.xml.stream.XMLStreamException;
 import org.mobicents.protocols.ss7.cap.api.CAPException;
-import org.mobicents.protocols.ss7.cap.api.CAPParsingComponentException;
-import org.mobicents.protocols.ss7.cap.api.CAPParsingComponentExceptionReason;
 import org.mobicents.protocols.ss7.cap.api.primitives.CalledPartyBCDNumber;
+import org.mobicents.protocols.ss7.map.api.MAPException;
+import org.mobicents.protocols.ss7.map.api.MAPParsingComponentException;
+import org.mobicents.protocols.ss7.map.api.primitives.AddressNature;
+import org.mobicents.protocols.ss7.map.api.primitives.NumberingPlan;
+import org.mobicents.protocols.ss7.map.primitives.OctetStringBase;
+import org.mobicents.protocols.ss7.map.primitives.TbcdString;

 /**
  *
  * @author sergey vetyutnev
  *
  */
-public class CalledPartyBCDNumberImpl implements CalledPartyBCDNumber, CAPAsnPrimitive { +public class CalledPartyBCDNumberImpl extends OctetStringBase implements CalledPartyBCDNumber {

-       public static final String _PrimitiveName = "CalledPartyBCDNumber";
+       private static final String NAI = "nai";
+       private static final String NPI = "npi";
+       private static final String NUMBER = "number";

-       private byte[] data;
+       protected static final int NO_EXTENSION_MASK = 0x80;
+       protected static final int NATURE_OF_ADD_IND_MASK = 0x70;
+       protected static final int NUMBERING_PLAN_IND_MASK = 0x0F;

-
        public CalledPartyBCDNumberImpl() {
+               super(1, 41, "CalledPartyBCDNumber");
        }
-
+
        public CalledPartyBCDNumberImpl(byte[] data) {
-               this.data = data;
+               super(1, 41, "CalledPartyBCDNumber", data);
        }

-       @Override
-       public byte[] getData() {
-               return this.data;
-       }
+ public CalledPartyBCDNumberImpl(AddressNature addressNature, NumberingPlan numberingPlan, String address) throws CAPException {
+               super(1, 41, "CalledPartyBCDNumber");

-
-       @Override
-       public int getTag() throws CAPException {
-               return Tag.STRING_OCTET;
+               this.setParameters(addressNature, numberingPlan, address);
        }

-       @Override
-       public int getTagClass() {
-               return Tag.CLASS_UNIVERSAL;
-       }
+ protected void setParameters(AddressNature addressNature, NumberingPlan numberingPlan, String address) throws CAPException {

-       @Override
-       public boolean getIsPrimitive() {
-               return true;
-       }
+               if (addressNature == null || numberingPlan == null || address 
== null)
+ throw new CAPException("Error when encoding " + _PrimitiveName + ": addressNature, numberingPlan or address is empty");

-       @Override
- public void decodeAll(AsnInputStream ansIS) throws CAPParsingComponentException {
+               this._testLengthEncode(address);

-               try {
-                       int length = ansIS.readLength();
-                       this._decode(ansIS, length);
-               } catch (IOException e) {
- throw new CAPParsingComponentException("IOException when decoding CalledPartyBCDNumber: " + e.getMessage(), e,
-                                       
CAPParsingComponentExceptionReason.MistypedParameter);
-               } catch (AsnException e) {
- throw new CAPParsingComponentException("AsnException when decoding CalledPartyBCDNumber: " + e.getMessage(), e,
-                                       
CAPParsingComponentExceptionReason.MistypedParameter);
+               ByteArrayOutputStream stm = new ByteArrayOutputStream();
+
+               int nature;
+               if (address.length() % 2 != 0) // odd digits
+                       nature = 0x80;
+               else
+                       nature = 0;
+               nature = nature | (addressNature.getIndicator() << 4);
+               nature = nature | (numberingPlan.getIndicator());
+               stm.write(nature);
+
+               if (numberingPlan == NumberingPlan.spare_5) {
+ // -- In the context of the DestinationSubscriberNumber field in ConnectSMSArg or + // -- InitialDPSMSArg, a CalledPartyBCDNumber may also contain an alphanumeric + // -- character string. In this case, type-of-number '101'B is used, in accordance + // -- with 3GPP TS 23.040 [6]. The address is coded in accordance with the
+                       // -- GSM 7-bit default alphabet definition and the SMS 
packing rules
+                       // -- as specified in 3GPP TS 23.038 [15] in this case.
+
+                       // .....................................
+
+
+               } else {
+                       try {
+                               TbcdString.encodeString(stm, address);
+                       } catch (MAPException e) {
+                               throw new CAPException(e);
+                       }
                }
        }
+
+
+       public byte[] getData() {
+               return data;
+       }

-       @Override
- public void decodeData(AsnInputStream ansIS, int length) throws CAPParsingComponentException {
+       public AddressNature getAddressNature() {

-               try {
-                       this._decode(ansIS, length);
-               } catch (IOException e) {
- throw new CAPParsingComponentException("IOException when decoding CalledPartyBCDNumber: " + e.getMessage(), e,
-                                       
CAPParsingComponentExceptionReason.MistypedParameter);
-               } catch (AsnException e) {
- throw new CAPParsingComponentException("AsnException when decoding CalledPartyBCDNumber: " + e.getMessage(), e,
-                                       
CAPParsingComponentExceptionReason.MistypedParameter);
-               }
+               if (this.data == null || this.data.length == 0)
+                       return null;
+
+               int nature = this.data[0];
+               int natureOfAddInd = ((nature & NATURE_OF_ADD_IND_MASK) >> 4);
+               return AddressNature.getInstance(natureOfAddInd);
        }

- private void _decode(AsnInputStream ansIS, int length) throws CAPParsingComponentException, IOException, AsnException {
-
-               this.data = ansIS.readOctetStringData(length);
-               if (this.data.length < 1 || this.data.length > 41)
- throw new CAPParsingComponentException("Error decoding CalledPartyBCDNumber: length must be from 1 to 41, real length = " + length,
-                                       
CAPParsingComponentExceptionReason.MistypedParameter);
+       public NumberingPlan getNumberingPlan() {
+
+               if (this.data == null || this.data.length == 0)
+                       return null;
+
+               int nature = this.data[0];
+               int numbPlanInd = (nature & NUMBERING_PLAN_IND_MASK);
+               return NumberingPlan.getInstance(numbPlanInd);
        }

-       @Override
-       public void encodeAll(AsnOutputStream asnOs) throws CAPException {
-               this.encodeAll(asnOs, this.getTagClass(), this.getTag());
+       public boolean isExtension() {
+
+               if (this.data == null || this.data.length == 0)
+                       return false;
+
+               int nature = this.data[0];
+               if ((nature & NO_EXTENSION_MASK) == 0x80)
+                       return true;
+               else
+                       return false;
        }

-       @Override
- public void encodeAll(AsnOutputStream asnOs, int tagClass, int tag) throws CAPException {
+       public String getAddress() {
+
+               if (this.data == null || this.data.length == 0)
+                       return null;

                try {
-                       asnOs.writeTag(tagClass, this.getIsPrimitive(), tag);
-                       int pos = asnOs.StartContentDefiniteLength();
-                       this.encodeData(asnOs);
-                       asnOs.FinalizeContent(pos);
-               } catch (AsnException e) {
- throw new CAPException("AsnException when encoding " + _PrimitiveName + ": " + e.getMessage(), e);
+                       if (this.getNumberingPlan() == NumberingPlan.spare_5) {
+ // -- In the context of the DestinationSubscriberNumber field in ConnectSMSArg or + // -- InitialDPSMSArg, a CalledPartyBCDNumber may also contain an alphanumeric + // -- character string. In this case, type-of-number '101'B is used, in accordance + // -- with 3GPP TS 23.040 [6]. The address is coded in accordance with the
+                               // -- GSM 7-bit default alphabet definition and 
the SMS packing rules
+                               // -- as specified in 3GPP TS 23.038 [15] in 
this case.
+
+                               // .....................................
+                               return null;
+
+
+                       } else {
+
+                               ByteArrayInputStream stm = new 
ByteArrayInputStream(this.data);
+                               stm.read();
+                               String address = TbcdString.decodeString(stm, 
this.data.length - 1);
+                               return address;
+                       }
+               } catch (MAPParsingComponentException e) {
+                       return null;
+               } catch (IOException e) {
+                       return null;
                }
        }

-       @Override
-       public void encodeData(AsnOutputStream asnOs) throws CAPException {

-               if (this.data == null)
- throw new CAPException("Error while encoding " + _PrimitiveName + ": data field must not be null");
+
+
+       protected void _testLengthEncode(String address) throws CAPException {

-               asnOs.writeOctetStringData(data);
+               if (address.length() > 38)
+ throw new CAPException("Error when encoding AddressString: address length must not exceed 38 digits");
        }

+
+
+
+
+
+
+
+
+// private void _decode(AsnInputStream ansIS, int length) throws CAPParsingComponentException, IOException {
+//
+//             // The first byte has extension, nature of address indicator and
+//             // numbering plan indicator
+//             int nature = ansIS.read();
+//
+//             if ((nature & NO_EXTENSION_MASK) == 0x80) {
+//                     this.isExtension = false;
+//             } else {
+//                     this.isExtension = true;
+//             }
+//
+//             int natureOfAddInd = ((nature & NATURE_OF_ADD_IND_MASK) >> 4);
+//
+//             this.addressNature = AddressNature.getInstance(natureOfAddInd);
+//
+//             int numbPlanInd = (nature & NUMBERING_PLAN_IND_MASK);
+//
+//             this.numberingPlan = NumberingPlan.getInstance(numbPlanInd);
+//
+//             try {
+//                     this.address = TbcdString.decodeString(ansIS, length - 
1);
+//             } catch (MAPParsingComponentException e) {
+// throw new CAPParsingComponentException(e,CAPParsingComponentExceptionReason.MistypedParameter);
+//             }
+//     }
+
+
+//     public void encodeData(AsnOutputStream asnOs) throws CAPException {
+//
+// if (this.addressNature == null || this.numberingPlan == null || this.address == null)
+//                     throw new CAPException(
+// "Error when encoding AddressString: addressNature, numberingPlan or address is empty");
+//
+//             this._testLengthEncode();
+//
+//             int nature = 1;
+//
+//             if (this.isExtension) {
+//                     nature = 0;
+//             }
+//
+//             nature = nature << 7;
+//
+//             nature = nature | (this.addressNature.getIndicator() << 4);
+//
+//             nature = nature | (this.numberingPlan.getIndicator());
+//
+//             asnOs.write(nature);
+//             try {
+//                     TbcdString.encodeString(asnOs, this.address);
+//             } catch (MAPException e) {
+//                     throw new CAPException(e);
+//             }
+//     }
+
        @Override
        public String toString() {

                StringBuilder sb = new StringBuilder();
                sb.append(_PrimitiveName);
                sb.append(" [");
-               if (this.data != null) {
-                       sb.append("data=");
-                       sb.append(printDataArr(data));
+               if (this.getAddressNature() != null) {
+                       sb.append("addressNature=");
+                       sb.append(this.getAddressNature());
+               }
+               if (this.getNumberingPlan() != null) {
+                       sb.append(", numberingPlan=");
+                       sb.append(this.getNumberingPlan());
+               }
+               if (this.getAddress() != null) {
+                       sb.append(", address=");
+                       sb.append(this.getAddress());
                }
                sb.append("]");

                return sb.toString();
        }

-       private String printDataArr(byte[] arr) {
-               StringBuilder sb = new StringBuilder();
-               for (int b : arr) {
-                       sb.append(b);
-                       sb.append(", ");
+       /**
+        * XML Serialization/Deserialization
+        */
+ protected static final XMLFormat<CalledPartyBCDNumberImpl> ADDRESS_STRING_XML = new XMLFormat<CalledPartyBCDNumberImpl>(
+                       CalledPartyBCDNumberImpl.class) {
+
+               @Override
+ public void read(javolution.xml.XMLFormat.InputElement xml, CalledPartyBCDNumberImpl addressStringImpl)
+                               throws XMLStreamException {
+                       try {
+ addressStringImpl.setParameters(AddressNature.getInstance(xml.getAttribute(NAI, 0)), NumberingPlan.getInstance(xml.getAttribute(NPI, 0)),
+                                               xml.getAttribute(NUMBER, ""));
+                       } catch (CAPException e) {
+                               // TODO Auto-generated catch block
+                               e.printStackTrace();
+                       }
                }

-               return sb.toString();
-       }
+               @Override
+ public void write(CalledPartyBCDNumberImpl addressStringImpl, javolution.xml.XMLFormat.OutputElement xml)
+                               throws XMLStreamException {
+
+ xml.setAttribute(NAI, addressStringImpl.getAddressNature().getIndicator()); + xml.setAttribute(NPI, addressStringImpl.getNumberingPlan().getIndicator());
+                       xml.setAttribute(NUMBER, 
addressStringImpl.getAddress());
+               }
+       };
 }
+
=======================================
--- /cap/cap-impl/src/main/java/org/mobicents/protocols/ss7/cap/service/circuitSwitchedCall/primitive/EventSpecificInformationBCSMImpl.java Mon Apr 23 10:53:14 2012 +++ /cap/cap-impl/src/main/java/org/mobicents/protocols/ss7/cap/service/circuitSwitchedCall/primitive/EventSpecificInformationBCSMImpl.java Wed Aug 8 06:30:23 2012
@@ -28,6 +28,7 @@
 import org.mobicents.protocols.asn.AsnInputStream;
 import org.mobicents.protocols.asn.AsnOutputStream;
 import org.mobicents.protocols.asn.Tag;
+import org.mobicents.protocols.ss7.cap.EsiBcsm.OAbandonSpecificInfoImpl;
 import org.mobicents.protocols.ss7.cap.EsiBcsm.OAnswerSpecificInfoImpl;
import org.mobicents.protocols.ss7.cap.EsiBcsm.OCalledPartyBusySpecificInfoImpl;
 import org.mobicents.protocols.ss7.cap.EsiBcsm.ODisconnectSpecificInfoImpl;
@@ -413,8 +414,8 @@
                                ais.advanceElementData(length);
                                break;
                        case _ID_oAbandonSpecificInfo:
-                               // TODO: implement it
-                               ais.advanceElementData(length);
+                               this.oAbandonSpecificInfo=new 
OAbandonSpecificInfoImpl();
+ ((OAbandonSpecificInfoImpl) this.oAbandonSpecificInfo).decodeData(ais, length);
                                break;
                        case _ID_oChangeOfPositionSpecificInfo:
                                // TODO: implement it
@@ -492,7 +493,8 @@
                } else if (callAcceptedSpecificInfo != null) {
                        // TODO: implement it
                } else if (oAbandonSpecificInfo != null) {
-                       // TODO: implement it
+                       ((OAbandonSpecificInfoImpl) 
oAbandonSpecificInfo).encodeData(asnOs);
+                       return;
                } else if (oChangeOfPositionSpecificInfo != null) {
                        // TODO: implement it
                } else if (tChangeOfPositionSpecificInfo != null) {
=======================================
--- /cap/cap-impl/src/test/java/org/mobicents/protocols/ss7/cap/primitives/CalledPartyBCDNumberTest.java Mon Apr 23 10:53:14 2012 +++ /cap/cap-impl/src/test/java/org/mobicents/protocols/ss7/cap/primitives/CalledPartyBCDNumberTest.java Wed Aug 8 06:30:23 2012
@@ -29,7 +29,9 @@
 import org.mobicents.protocols.asn.AsnInputStream;
 import org.mobicents.protocols.asn.AsnOutputStream;
 import org.mobicents.protocols.asn.Tag;
-import org.testng.*;import org.testng.annotations.*;
+import org.mobicents.protocols.ss7.map.api.primitives.AddressNature;
+import org.mobicents.protocols.ss7.map.api.primitives.NumberingPlan;
+import org.testng.annotations.*;

 /**
  *
@@ -54,7 +56,11 @@
                CalledPartyBCDNumberImpl elem = new CalledPartyBCDNumberImpl();
                int tag = ais.readTag();
                elem.decodeAll(ais);
+
                assertTrue(Arrays.equals(elem.getData(), this.getIntData1()));
+ assertEquals(elem.getAddressNature(), AddressNature.international_number);
+               assertEquals(elem.getNumberingPlan(), NumberingPlan.ISDN);
+               assertTrue(elem.getAddress().equals("41788005047"));
        }

        @Test(groups = { "functional.encode","primitives"})
@@ -64,5 +70,10 @@
                AsnOutputStream aos = new AsnOutputStream();
                elem.encodeAll(aos, Tag.CLASS_CONTEXT_SPECIFIC, 56);
                assertTrue(Arrays.equals(aos.toByteArray(), this.getData1()));
+
+ elem = new CalledPartyBCDNumberImpl(AddressNature.international_number, NumberingPlan.ISDN, "41788005047");
+               aos = new AsnOutputStream();
+               elem.encodeAll(aos, Tag.CLASS_CONTEXT_SPECIFIC, 56);
+               assertTrue(Arrays.equals(aos.toByteArray(), this.getData1()));
        }
 }

==============================================================================
Revision: 480ade980ce2
Author:   Sergey Vetyutnev <[email protected]>
Date:     Wed Aug  8 10:56:21 2012
Log: CAP community update: CalledPartyBCDNumber and OAbandonSpecificInfo
http://code.google.com/p/jss7/source/detail?r=480ade980ce2

Modified:
 /cap/CAPMessagesImplemented.ods
/cap/cap-api/src/main/java/org/mobicents/protocols/ss7/cap/api/CAPParameterFactory.java /cap/cap-api/src/main/java/org/mobicents/protocols/ss7/cap/api/primitives/CalledPartyBCDNumber.java /cap/cap-impl/src/main/java/org/mobicents/protocols/ss7/cap/CAPParameterFactoryImpl.java /cap/cap-impl/src/main/java/org/mobicents/protocols/ss7/cap/EsiBcsm/OAbandonSpecificInfoImpl.java /cap/cap-impl/src/main/java/org/mobicents/protocols/ss7/cap/primitives/CalledPartyBCDNumberImpl.java /cap/cap-impl/src/test/java/org/mobicents/protocols/ss7/cap/primitives/CalledPartyBCDNumberTest.java

=======================================
--- /cap/CAPMessagesImplemented.ods     Mon Aug  6 21:52:31 2012
+++ /cap/CAPMessagesImplemented.ods     Wed Aug  8 10:56:21 2012
Binary file, no diff available.
=======================================
--- /cap/cap-api/src/main/java/org/mobicents/protocols/ss7/cap/api/CAPParameterFactory.java Wed Aug 8 06:30:23 2012 +++ /cap/cap-api/src/main/java/org/mobicents/protocols/ss7/cap/api/CAPParameterFactory.java Wed Aug 8 10:56:21 2012
@@ -24,7 +24,6 @@

 import java.util.ArrayList;

-import org.mobicents.protocols.ss7.cap.EsiBcsm.OAbandonSpecificInfoImpl;
import org.mobicents.protocols.ss7.cap.api.EsiBcsm.CallAcceptedSpecificInfo;
 import org.mobicents.protocols.ss7.cap.api.EsiBcsm.ChargeIndicator;
 import org.mobicents.protocols.ss7.cap.api.EsiBcsm.OAbandonSpecificInfo;
@@ -123,9 +122,11 @@
import org.mobicents.protocols.ss7.isup.message.parameter.OriginalCalledNumber; import org.mobicents.protocols.ss7.isup.message.parameter.RedirectingNumber; import org.mobicents.protocols.ss7.isup.message.parameter.UserServiceInformation;
+import org.mobicents.protocols.ss7.map.api.primitives.AddressNature;
 import org.mobicents.protocols.ss7.map.api.primitives.AlertingPattern;
 import org.mobicents.protocols.ss7.map.api.primitives.IMEI;
 import org.mobicents.protocols.ss7.map.api.primitives.ISDNAddressString;
+import org.mobicents.protocols.ss7.map.api.primitives.NumberingPlan;
 import org.mobicents.protocols.ss7.map.api.service.callhandling.UUData;
import org.mobicents.protocols.ss7.map.api.service.mobility.subscriberInformation.MSClassmark2; import org.mobicents.protocols.ss7.map.api.service.mobility.subscriberManagement.ExtBasicServiceCode;
@@ -152,6 +153,7 @@
                        boolean automaticRearm);

        public CalledPartyBCDNumber createCalledPartyBCDNumber(byte[] data);
+ public CalledPartyBCDNumber createCalledPartyBCDNumber(AddressNature addressNature, NumberingPlan numberingPlan, String address, boolean isExtension) throws CAPException;

public ExtensionField createExtensionField(Integer localCode, CriticalityType criticalityType, byte[] data); public ExtensionField createExtensionField(long[] globalCode, CriticalityType criticalityType, byte[] data);
=======================================
--- /cap/cap-api/src/main/java/org/mobicents/protocols/ss7/cap/api/primitives/CalledPartyBCDNumber.java Wed Aug 8 06:30:23 2012 +++ /cap/cap-api/src/main/java/org/mobicents/protocols/ss7/cap/api/primitives/CalledPartyBCDNumber.java Wed Aug 8 10:56:21 2012
@@ -62,4 +62,6 @@

        public String getAddress();

+       public boolean isExtension();
+
 }
=======================================
--- /cap/cap-impl/src/main/java/org/mobicents/protocols/ss7/cap/CAPParameterFactoryImpl.java Wed Aug 8 06:30:23 2012 +++ /cap/cap-impl/src/main/java/org/mobicents/protocols/ss7/cap/CAPParameterFactoryImpl.java Wed Aug 8 10:56:21 2012
@@ -187,9 +187,11 @@
import org.mobicents.protocols.ss7.isup.message.parameter.OriginalCalledNumber; import org.mobicents.protocols.ss7.isup.message.parameter.RedirectingNumber; import org.mobicents.protocols.ss7.isup.message.parameter.UserServiceInformation;
+import org.mobicents.protocols.ss7.map.api.primitives.AddressNature;
 import org.mobicents.protocols.ss7.map.api.primitives.AlertingPattern;
 import org.mobicents.protocols.ss7.map.api.primitives.IMEI;
 import org.mobicents.protocols.ss7.map.api.primitives.ISDNAddressString;
+import org.mobicents.protocols.ss7.map.api.primitives.NumberingPlan;
 import org.mobicents.protocols.ss7.map.api.service.callhandling.UUData;
import org.mobicents.protocols.ss7.map.api.service.mobility.subscriberInformation.MSClassmark2; import org.mobicents.protocols.ss7.map.api.service.mobility.subscriberManagement.ExtBasicServiceCode;
@@ -249,6 +251,12 @@
                return new CalledPartyBCDNumberImpl(data);
        }

+       @Override
+ public CalledPartyBCDNumber createCalledPartyBCDNumber(AddressNature addressNature, NumberingPlan numberingPlan, String address, boolean isExtension) throws CAPException { + return new CalledPartyBCDNumberImpl(addressNature, numberingPlan, address, isExtension);
+       }
+
+
        @Override
public ExtensionField createExtensionField(Integer localCode, CriticalityType criticalityType, byte[] data) {
                return new ExtensionFieldImpl(localCode, criticalityType, data);
=======================================
--- /cap/cap-impl/src/main/java/org/mobicents/protocols/ss7/cap/EsiBcsm/OAbandonSpecificInfoImpl.java Wed Aug 8 06:30:23 2012 +++ /cap/cap-impl/src/main/java/org/mobicents/protocols/ss7/cap/EsiBcsm/OAbandonSpecificInfoImpl.java Wed Aug 8 10:56:21 2012
@@ -32,9 +32,6 @@
 import org.mobicents.protocols.ss7.cap.api.CAPParsingComponentException;
import org.mobicents.protocols.ss7.cap.api.CAPParsingComponentExceptionReason;
 import org.mobicents.protocols.ss7.cap.api.EsiBcsm.OAbandonSpecificInfo;
-import org.mobicents.protocols.ss7.cap.api.EsiBcsm.TNoAnswerSpecificInfo;
-import org.mobicents.protocols.ss7.cap.api.isup.CalledPartyNumberCap;
-import org.mobicents.protocols.ss7.cap.isup.CalledPartyNumberCapImpl;
 import org.mobicents.protocols.ss7.cap.primitives.CAPAsnPrimitive;
 import org.mobicents.protocols.ss7.map.api.MAPParsingComponentException;

=======================================
--- /cap/cap-impl/src/main/java/org/mobicents/protocols/ss7/cap/primitives/CalledPartyBCDNumberImpl.java Wed Aug 8 06:30:23 2012 +++ /cap/cap-impl/src/main/java/org/mobicents/protocols/ss7/cap/primitives/CalledPartyBCDNumberImpl.java Wed Aug 8 10:56:21 2012
@@ -25,11 +25,18 @@
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.CharacterCodingException;

 import javolution.xml.XMLFormat;
 import javolution.xml.stream.XMLStreamException;
 import org.mobicents.protocols.ss7.cap.api.CAPException;
 import org.mobicents.protocols.ss7.cap.api.primitives.CalledPartyBCDNumber;
+import org.mobicents.protocols.ss7.map.GSMCharset;
+import org.mobicents.protocols.ss7.map.GSMCharsetDecoder;
+import org.mobicents.protocols.ss7.map.GSMCharsetDecodingData;
+import org.mobicents.protocols.ss7.map.GSMCharsetEncoder;
 import org.mobicents.protocols.ss7.map.api.MAPException;
 import org.mobicents.protocols.ss7.map.api.MAPParsingComponentException;
 import org.mobicents.protocols.ss7.map.api.primitives.AddressNature;
@@ -60,13 +67,13 @@
                super(1, 41, "CalledPartyBCDNumber", data);
        }

- public CalledPartyBCDNumberImpl(AddressNature addressNature, NumberingPlan numberingPlan, String address) throws CAPException { + public CalledPartyBCDNumberImpl(AddressNature addressNature, NumberingPlan numberingPlan, String address, boolean isExtension) throws CAPException {
                super(1, 41, "CalledPartyBCDNumber");

-               this.setParameters(addressNature, numberingPlan, address);
+               this.setParameters(addressNature, numberingPlan, address, 
isExtension);
        }

- protected void setParameters(AddressNature addressNature, NumberingPlan numberingPlan, String address) throws CAPException { + protected void setParameters(AddressNature addressNature, NumberingPlan numberingPlan, String address, boolean isExtension) throws CAPException {

                if (addressNature == null || numberingPlan == null || address 
== null)
throw new CAPException("Error when encoding " + _PrimitiveName + ": addressNature, numberingPlan or address is empty");
@@ -75,15 +82,15 @@

                ByteArrayOutputStream stm = new ByteArrayOutputStream();

-               int nature;
-               if (address.length() % 2 != 0) // odd digits
+               int nature = 0;
+               if (isExtension)
                        nature = 0x80;
                else
                        nature = 0;
                nature = nature | (addressNature.getIndicator() << 4);
                nature = nature | (numberingPlan.getIndicator());
                stm.write(nature);
-
+
                if (numberingPlan == NumberingPlan.spare_5) {
// -- In the context of the DestinationSubscriberNumber field in ConnectSMSArg or // -- InitialDPSMSArg, a CalledPartyBCDNumber may also contain an alphanumeric
@@ -91,10 +98,23 @@
// -- with 3GPP TS 23.040 [6]. The address is coded in accordance with the
                        // -- GSM 7-bit default alphabet definition and the SMS 
packing rules
                        // -- as specified in 3GPP TS 23.038 [15] in this case.
-
-                       // .....................................

-
+ GSMCharset cs = new GSMCharset(GSMCharset.GSM_CANONICAL_NAME, new String[] {});
+                       GSMCharsetEncoder encoder = (GSMCharsetEncoder) 
cs.newEncoder();
+                       ByteBuffer bb;
+                       try {
+                               bb = encoder.encode(CharBuffer.wrap(address));
+                               int dataLength = bb.limit();
+                               byte[] data = new byte[dataLength];
+                               bb.get(data);
+                               stm.write(data);
+                       } catch (CharacterCodingException e) {
+                               // TODO Auto-generated catch block
+                               e.printStackTrace();
+                       } catch (IOException e) {
+                               // TODO Auto-generated catch block
+                               e.printStackTrace();
+                       }
                } else {
                        try {
                                TbcdString.encodeString(stm, address);
@@ -102,7 +122,9 @@
                                throw new CAPException(e);
                        }
                }
-       }
+
+               this.data = stm.toByteArray();
+       }


        public byte[] getData() {
@@ -147,6 +169,8 @@
                        return null;

                try {
+                       ByteArrayInputStream stm = new 
ByteArrayInputStream(this.data);
+                       stm.read();
                        if (this.getNumberingPlan() == NumberingPlan.spare_5) {
// -- In the context of the DestinationSubscriberNumber field in ConnectSMSArg or // -- InitialDPSMSArg, a CalledPartyBCDNumber may also contain an alphanumeric
@@ -154,15 +178,22 @@
// -- with 3GPP TS 23.040 [6]. The address is coded in accordance with the
                                // -- GSM 7-bit default alphabet definition and 
the SMS packing rules
                                // -- as specified in 3GPP TS 23.038 [15] in 
this case.
-
-                               // .....................................
-                               return null;

+                               if (data.length == 1)
+                                       return "";

+                               int addressLength = this.data.length - 1;
+                               ByteBuffer bb = ByteBuffer.wrap(this.data, 1, 
addressLength);
+ GSMCharset cs = new GSMCharset(GSMCharset.GSM_CANONICAL_NAME, new String[] {});
+                               GSMCharsetDecoder decoder = (GSMCharsetDecoder) 
cs.newDecoder();
+                               int totalSeptetCount = addressLength + 
(addressLength / 8);
+ GSMCharsetDecodingData encodingData = new GSMCharsetDecodingData(totalSeptetCount, 0);
+                               decoder.setGSMCharsetDecodingData(encodingData);
+
+                               CharBuffer bf = decoder.decode(bb);
+                               return bf.toString();
                        } else {

-                               ByteArrayInputStream stm = new 
ByteArrayInputStream(this.data);
-                               stm.read();
                                String address = TbcdString.decodeString(stm, 
this.data.length - 1);
                                return address;
                        }
@@ -181,70 +212,6 @@
                if (address.length() > 38)
throw new CAPException("Error when encoding AddressString: address length must not exceed 38 digits");
        }
-
-
-
-
-
-
-
-
-
-// private void _decode(AsnInputStream ansIS, int length) throws CAPParsingComponentException, IOException {
-//
-//             // The first byte has extension, nature of address indicator and
-//             // numbering plan indicator
-//             int nature = ansIS.read();
-//
-//             if ((nature & NO_EXTENSION_MASK) == 0x80) {
-//                     this.isExtension = false;
-//             } else {
-//                     this.isExtension = true;
-//             }
-//
-//             int natureOfAddInd = ((nature & NATURE_OF_ADD_IND_MASK) >> 4);
-//
-//             this.addressNature = AddressNature.getInstance(natureOfAddInd);
-//
-//             int numbPlanInd = (nature & NUMBERING_PLAN_IND_MASK);
-//
-//             this.numberingPlan = NumberingPlan.getInstance(numbPlanInd);
-//
-//             try {
-//                     this.address = TbcdString.decodeString(ansIS, length - 
1);
-//             } catch (MAPParsingComponentException e) {
-// throw new CAPParsingComponentException(e,CAPParsingComponentExceptionReason.MistypedParameter);
-//             }
-//     }
-
-
-//     public void encodeData(AsnOutputStream asnOs) throws CAPException {
-//
-// if (this.addressNature == null || this.numberingPlan == null || this.address == null)
-//                     throw new CAPException(
-// "Error when encoding AddressString: addressNature, numberingPlan or address is empty");
-//
-//             this._testLengthEncode();
-//
-//             int nature = 1;
-//
-//             if (this.isExtension) {
-//                     nature = 0;
-//             }
-//
-//             nature = nature << 7;
-//
-//             nature = nature | (this.addressNature.getIndicator() << 4);
-//
-//             nature = nature | (this.numberingPlan.getIndicator());
-//
-//             asnOs.write(nature);
-//             try {
-//                     TbcdString.encodeString(asnOs, this.address);
-//             } catch (MAPException e) {
-//                     throw new CAPException(e);
-//             }
-//     }

        @Override
        public String toString() {
@@ -264,6 +231,9 @@
                        sb.append(", address=");
                        sb.append(this.getAddress());
                }
+               if (this.isExtension()) {
+                       sb.append(", extension");
+               }
                sb.append("]");

                return sb.toString();
@@ -280,7 +250,7 @@
                                throws XMLStreamException {
                        try {
addressStringImpl.setParameters(AddressNature.getInstance(xml.getAttribute(NAI, 0)), NumberingPlan.getInstance(xml.getAttribute(NPI, 0)),
-                                               xml.getAttribute(NUMBER, ""));
+                                               xml.getAttribute(NUMBER, ""), 
false);
                        } catch (CAPException e) {
                                // TODO Auto-generated catch block
                                e.printStackTrace();
=======================================
--- /cap/cap-impl/src/test/java/org/mobicents/protocols/ss7/cap/primitives/CalledPartyBCDNumberTest.java Wed Aug 8 06:30:23 2012 +++ /cap/cap-impl/src/test/java/org/mobicents/protocols/ss7/cap/primitives/CalledPartyBCDNumberTest.java Wed Aug 8 10:56:21 2012
@@ -43,6 +43,10 @@
        public byte[] getData1() {
return new byte[] { (byte) 159, 56, 7, 17, 20, (byte) 135, 8, 80, 64, (byte) 247 };
        }
+
+       public byte[] getData2() {
+ return new byte[] { (byte) 159, 56, 6, 21, (byte) 232, 50, (byte) 155, (byte) 253, 6 };
+       }

        public byte[] getIntData1() {
                return new byte[] { 17, 20, (byte) 135, 8, 80, 64, (byte) 247 };
@@ -61,6 +65,18 @@
assertEquals(elem.getAddressNature(), AddressNature.international_number);
                assertEquals(elem.getNumberingPlan(), NumberingPlan.ISDN);
                assertTrue(elem.getAddress().equals("41788005047"));
+               assertFalse(elem.isExtension());
+
+               data = this.getData2();
+               ais = new AsnInputStream(data);
+               elem = new CalledPartyBCDNumberImpl();
+               tag = ais.readTag();
+               elem.decodeAll(ais);
+
+ assertEquals(elem.getAddressNature(), AddressNature.international_number);
+               assertEquals(elem.getNumberingPlan(), NumberingPlan.spare_5);
+               assertTrue(elem.getAddress().equals("hello"));
+               assertFalse(elem.isExtension());
        }

        @Test(groups = { "functional.encode","primitives"})
@@ -71,9 +87,15 @@
                elem.encodeAll(aos, Tag.CLASS_CONTEXT_SPECIFIC, 56);
                assertTrue(Arrays.equals(aos.toByteArray(), this.getData1()));

- elem = new CalledPartyBCDNumberImpl(AddressNature.international_number, NumberingPlan.ISDN, "41788005047"); + elem = new CalledPartyBCDNumberImpl(AddressNature.international_number, NumberingPlan.ISDN, "41788005047", false);
                aos = new AsnOutputStream();
                elem.encodeAll(aos, Tag.CLASS_CONTEXT_SPECIFIC, 56);
                assertTrue(Arrays.equals(aos.toByteArray(), this.getData1()));
+
+               // GSM 7-bit default alphabet definition and the SMS packing 
rules
+ elem = new CalledPartyBCDNumberImpl(AddressNature.international_number, NumberingPlan.spare_5, "hello", false);
+               aos = new AsnOutputStream();
+               elem.encodeAll(aos, Tag.CLASS_CONTEXT_SPECIFIC, 56);
+               assertTrue(Arrays.equals(aos.toByteArray(), this.getData2()));
        }
 }

==============================================================================
Revision: 5a56d3fc428b
Author:   Sergey Vetyutnev <[email protected]>
Date:     Wed Aug  8 10:59:07 2012
Log:      Merge branch 'map8'
http://code.google.com/p/jss7/source/detail?r=5a56d3fc428b


Reply via email to