Removed all AVP methods in events and implementation for best practic…

…e and maintenance thru time. Issues #37 and #38, PR #111
RestComm · Sep 12, 2017 · c5017ad · c5017ad
1 parent 57614ed
commit c5017ad
Show file tree

Hide file tree

Showing 12 changed files with 0 additions and 1,578 deletions.
diff --git a/core/jdiameter/api/src/main/java/org/jdiameter/api/slg/events/LocationReportAnswer.java b/core/jdiameter/api/src/main/java/org/jdiameter/api/slg/events/LocationReportAnswer.java
@@ -45,10 +45,4 @@ public interface LocationReportAnswer extends AppAnswerEvent{
 
   int code = 8388621;
 
-  boolean isGMLCAddressAvpPresent();
-  java.net.InetAddress getGMLCAddress();
-
-  boolean isLCSReferenceNumberAvpPresent();
-  byte[] getLCSReferenceNumber();
-
 }
diff --git a/core/jdiameter/api/src/main/java/org/jdiameter/api/slg/events/LocationReportRequest.java b/core/jdiameter/api/src/main/java/org/jdiameter/api/slg/events/LocationReportRequest.java
@@ -45,49 +45,4 @@ public interface LocationReportRequest extends AppRequestEvent {
 
   int code = 8388621;
 
-  boolean isLocationEventAvpPresent();
-  int getLocationEvent();
-
-  boolean isUserNameAvpPresent(); // Mapped IE: IMSI
-  String getUserName(); // Mapped IE: IMSI
-
-  boolean isMSISDNAvpPresent();
-  byte[] getMSISDN();
-
-  boolean isIMEIAvpPresent();
-  String getIMEI();
-
-  boolean isLocationEstimateAvpPresent();
-  byte[] getLocationEstimate();
-
-  boolean isAccuracyFulfilmentIndicatorAvpPresent();
-  int getAccuracyFulfilmentIndicator();
-
-  boolean isAgeOfLocationEstimateAvpPresent();
-  long getAgeOfLocationEstimate();
-
-  boolean isVelocityEstimateAvpPresent();
-  byte[] getVelocityEstimate();
-
-  boolean isECGIAvpPresent();
-  byte[] getECGI();
-
-  boolean isCellGlobalIdentityAvpPresent();
-  byte[] getCellGlobalIdentity();
-
-  boolean isServiceAreaIdentityAvpPresent();
-  byte[] getServiceAreaIdentity();
-
-  boolean isLCSReferenceNumberAvpPresent();
-  byte[] getLCSReferenceNumber();
-
-  boolean isESMLCCellInfoAvpPresent();
-  long getCellPortionId();
-
-  boolean isCivicAddressAvpPresent();
-  String getCivicAddress();
-
-  boolean isBarometricPressureAvpPresent();
-  long getBarometricPressure();
-
 }
diff --git a/core/jdiameter/api/src/main/java/org/jdiameter/api/slg/events/ProvideLocationAnswer.java b/core/jdiameter/api/src/main/java/org/jdiameter/api/slg/events/ProvideLocationAnswer.java
@@ -48,34 +48,4 @@ public interface ProvideLocationAnswer extends AppAnswerEvent{
 
   int code = 8388620;
 
-  boolean isLocationEstimateAvpPresent();
-  byte[] getLocationEstimate();
-
-  boolean isAccuracyFulfilmentIndicatorAvpPresent();
-  int getAccuracyFulfilmentIndicator();
-
-  boolean isAgeOfLocationEstimateAvpPresent();
-  long getAgeOfLocationEstimate();
-
-  boolean isVelocityEstimateAvpPresent();
-  byte[] getVelocityEstimate();
-
-  boolean isECGIAvpPresent();
-  byte[] getECGI();
-
-  boolean isCellGlobalIdentityAvpPresent();
-  byte[] getCellGlobalIdentity();
-
-  boolean isServiceAreaIdentityAvpPresent();
-  byte[] getServiceAreaIdentity();
-
-  boolean isESMLCCellInfoAvpPresent();
-  long getCellPortionId();
-
-  boolean isCivicAddressAvpPresent();
-  String getCivicAddress();
-
-  boolean isBarometricPressureAvpPresent();
-  long getBarometricPressure();
-
 }
diff --git a/core/jdiameter/api/src/main/java/org/jdiameter/api/slg/events/ProvideLocationRequest.java b/core/jdiameter/api/src/main/java/org/jdiameter/api/slg/events/ProvideLocationRequest.java
@@ -48,36 +48,4 @@ public interface ProvideLocationRequest extends AppRequestEvent {
 
   int code = 8388620;
 
-  boolean isSLgLocationTypeAvpPresent();
-  int getSLgLocationType();
-
-  boolean isUserNameAvpPresent(); // Mapped IE: IMSI
-  String getUserName(); // Mapped IE: IMSI
-
-  boolean isMSISDNAvpPresent();
-  byte[] getMSISDN();
-
-  boolean isIMEIAvpPresent();
-  String getIMEI();
-
-  boolean isVelocityRequestedAvpPresent();
-  int getVelocityRequested();
-
-  boolean isDeferredLocationTypeAvpPresent();
-  long getDeferredLocationType();
-
-  boolean isLCSReferenceNumberAvpPresent();
-  byte[] getLCSReferenceNumber();
-
-  boolean isGMLCAddressAvpPresent();
-  java.net.InetAddress getGMLCAddress();
-
-  boolean isPeriodicLDRInfoAvpPresent();
-  // Periodic-LDR-Info AVP of type grouped, includes:
-  // Reporting-Amount, Reporting-Interval
-  boolean isReportingAmountAvpPresent();
-  long getReportingAmount();
-  boolean isReportingIntervalAvpPresent();
-  long getReportingInterval();
-
 }
diff --git a/core/jdiameter/api/src/main/java/org/jdiameter/api/slh/events/LCSRoutingInfoAnswer.java b/core/jdiameter/api/src/main/java/org/jdiameter/api/slh/events/LCSRoutingInfoAnswer.java
@@ -42,91 +42,4 @@ public interface LCSRoutingInfoAnswer extends AppAnswerEvent {
 
   int code = 8388622;
 
-  boolean isUserNameAVPPresent(); // Mapped IE: IMSI
-  String getUserName(); // Mapped IE: IMSI
-
-  boolean isMSISDNAVPPresent();
-  byte[] getMSISDN();
-
-  boolean isLMSIAVPPresent();
-  byte[] getLMSI();
-
-  boolean isServingNodeAVPPresent();
-  // Serving-Node AVP of type grouped, includes:
-  // SGSN-Number, SGSN-Name, SGSN-Realm
-  // MME-Name, MME-Realm
-  // MSC-Number
-  // 3GPP-AAA-Server-Name
-  // LCS-Capabilities-Sets
-  // GMLC-Address
-
-  boolean isSGSNNumberAVPPresent();
-  byte[] getSGSNNumber();
-
-  boolean isSGSNNameAVPPresent();
-  String getSGSNName();
-
-  boolean isSGSNRealmAVPPresent();
-  String getSGSNRealm();
-
-  boolean isMMENameAVPPresent();
-  String getMMEName();
-
-  boolean isMMERealmAVPPresent();
-  String getMMERealm();
-
-  boolean isMSCNumberAVPPresent();
-  byte[] getMSCNumber();
-
-  boolean is3GPPAAAServerNameAVPPresent();
-  String get3GPPAAAServerName();
-
-  boolean isLCSCapabilitiesSetsAVPPresent();
-  long getLCSCapabilitiesSets();
-
-  boolean isGMLCAddressAVPPresent();
-  java.net.InetAddress getGMLCAddress();
-
-  boolean isAdditionalServingNodeAVPPresent();
-  // Serving-Node AVP of type grouped, includes:
-  // SGSN-Number, SGSN-Name, SGSN-Realm
-  // MME-Name, MME-Realm
-  // MSC-Number
-  // 3GPP-AAA-Server-Name
-  // LCS-Capabilities-Sets
-  // GMLC-Address
-
-  boolean isAdditionalSGSNNumberAVPPresent();
-  byte[] getAdditionalSGSNNumber();
-
-  boolean isAdditionalSGSNNameAVPPresent();
-  String getAdditionalSGSNName();
-
-  boolean isAdditionalSGSNRealmAVPPresent();
-  String getAdditionalSGSNRealm();
-
-  boolean isAdditionalMMENameAVPPresent();
-  String getAdditionalMMEName();
-
-  boolean isAdditionalMMERealmAVPPresent();
-  String getAdditionalMMERealm();
-
-  boolean isAdditionalMSCNumberAVPPresent();
-  byte[] getAdditionalMSCNumber();
-
-  boolean isAdditional3GPPAAAServerNameAVPPresent();
-  String getAdditional3GPPAAAServerName();
-
-  boolean isAdditionalLCSCapabilitiesSetsAVPPresent();
-  long getAdditionalLCSCapabilitiesSets();
-
-  boolean isAdditionalGMLCAddressAVPPresent();
-  java.net.InetAddress getAdditionalGMLCAddress();
-
-  boolean isPPRAddressAVPPresent();
-  java.net.InetAddress getPPRAddress();
-
-  boolean isRIAFlagsAVPPresent();
-  long getRIAFLags();
-
 }
diff --git a/core/jdiameter/api/src/main/java/org/jdiameter/api/slh/events/LCSRoutingInfoRequest.java b/core/jdiameter/api/src/main/java/org/jdiameter/api/slh/events/LCSRoutingInfoRequest.java
@@ -41,13 +41,4 @@ public interface LCSRoutingInfoRequest extends AppRequestEvent {
 
   int code = 8388622;
 
-  boolean isUserNameAVPPresent(); // Mapped IE: IMSI
-  String getUserName(); // Mapped IE: IMSI
-
-  boolean isMSISDNAVPPresent();
-  byte[] getMSISDN();
-
-  boolean isGMLCNumberAVPPresent();
-  byte[] getGMLCNumber();
-
 }
diff --git a/...ameter/impl/src/main/java/org/jdiameter/common/impl/app/slg/LocationReportAnswerImpl.java b/...ameter/impl/src/main/java/org/jdiameter/common/impl/app/slg/LocationReportAnswerImpl.java
@@ -62,40 +62,4 @@ public Avp getResultCodeAvp() throws AvpDataException {
     return null;
   }
 
-  @Override
-  public boolean isGMLCAddressAvpPresent() {
-    return super.message.getAvps().getAvp(Avp.GMLC_ADDRESS) != null;
-  }
-
-  @Override
-  public java.net.InetAddress getGMLCAddress() {
-    Avp lcsGMLCAddressAvp = super.message.getAvps().getAvp(Avp.GMLC_ADDRESS);
-    if (lcsGMLCAddressAvp != null) {
-      try {
-        return lcsGMLCAddressAvp.getAddress();
-      } catch (AvpDataException e) {
-        logger.debug("Failure trying to obtain GMLC Address AVP value", e);
-      }
-    }
-    return null;
-  }
-
-  @Override
-  public boolean isLCSReferenceNumberAvpPresent() {
-    return super.message.getAvps().getAvp(Avp.LCS_REFERENCE_NUMBER) != null;
-  }
-
-  @Override
-  public byte[] getLCSReferenceNumber() {
-    Avp lcsLCSReferenceNumberAvp = super.message.getAvps().getAvp(Avp.LCS_REFERENCE_NUMBER);
-    if (lcsLCSReferenceNumberAvp != null) {
-      try {
-        return lcsLCSReferenceNumberAvp.getOctetString();
-      } catch (AvpDataException e) {
-        logger.debug("Failure trying to obtain LCS Reference Number AVP value", e);
-      }
-    }
-    return null;
-  }
-
 }