Merge pull request opentelecoms-org#33 from georgekankava/staging/mul…

…tiple-code-improvements-fix-3 multiple code improvements: squid:S1213, squid:S1488, squid:S1197, squid:S00115
vishnudixit · Feb 26, 2016 · 6221d82 · 6221d82
2 parents b0629d6 + b07d314
commit 6221d82
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 11 deletions.
diff --git a/jsmpp/src/main/java/org/jsmpp/DefaultPDUSender.java b/jsmpp/src/main/java/org/jsmpp/DefaultPDUSender.java
@@ -110,7 +110,7 @@ public byte[] sendBindResp(OutputStream os, int commandId,
             int sequenceNumber, String systemId, InterfaceVersion interfaceVersion) throws PDUStringException,
             IOException {
 
-        OptionalParameter p[];
+        OptionalParameter[] p;
         if(interfaceVersion != null) {
             OptionalParameter interfaceVersionParam = new OptionalParameter.Byte(Tag.SC_INTERFACE_VERSION, interfaceVersion.value());
             p = new OptionalParameter[] {interfaceVersionParam};

diff --git a/jsmpp/src/main/java/org/jsmpp/SMPPConstant.java b/jsmpp/src/main/java/org/jsmpp/SMPPConstant.java
@@ -343,7 +343,7 @@ public interface SMPPConstant {
 
     public static final short TAG_SC_INTERFACE_VERSION = 0x0210;
     public static final short TAG_SAR_MSG_REF_NUM = 0X020C;
-    public static final short TAG_SAR_TOTAl_SEGMENTS = 0x020e;
+    public static final short TAG_SAR_TOTAL_SEGMENTS = 0x020e;
     public static final short TAG_SAR_SEGMENT_SEQNUM = 0x020f;
 
     /*

diff --git a/jsmpp/src/main/java/org/jsmpp/bean/DeliverSm.java b/jsmpp/src/main/java/org/jsmpp/bean/DeliverSm.java
@@ -25,6 +25,10 @@ public class DeliverSm extends MessageRequest {
 
 	private String id;
 
+	public DeliverSm() {
+		super();
+	}
+
 	public String getId() {
 		return id;
 	}
@@ -33,10 +37,6 @@ public void setId(String id) {
 		this.id = id;
 	}
 
-	public DeliverSm() {
-		super();
-	}
-
 	/**
      * Get the short message as {@link DeliveryReceipt}. This method will be
      * valid if the parsed short message valid and Message Type (esm_class)

diff --git a/jsmpp/src/main/java/org/jsmpp/bean/SarSegmentSeqnum.java b/jsmpp/src/main/java/org/jsmpp/bean/SarSegmentSeqnum.java
@@ -45,8 +45,7 @@ public short getValue() {
 
     @Override
     public int hashCode() {
-        int result = 1;
-        return result;
+        return 1;
     }
 
     @Override

diff --git a/jsmpp/src/main/java/org/jsmpp/bean/SarTotalSegments.java b/jsmpp/src/main/java/org/jsmpp/bean/SarTotalSegments.java
@@ -32,7 +32,7 @@ public SarTotalSegments(short value) {
     }
 
     public short getTag() {
-        return SMPPConstant.TAG_SAR_TOTAl_SEGMENTS;
+        return SMPPConstant.TAG_SAR_TOTAL_SEGMENTS;
     }
 
     public short getLength() {
@@ -45,8 +45,7 @@ public short getValue() {
 
     @Override
     public int hashCode() {
-        int result = 1;
-        return result;
+        return 1;
     }
 
     @Override