Skip to content

Commit d98f1b7

Browse files
Merge pull request #192 from vpavic/remove-lombok
Remove Lombok
2 parents 3c900f7 + 318e876 commit d98f1b7

File tree

3 files changed

+133
-30
lines changed

3 files changed

+133
-30
lines changed

pom.xml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,6 @@
3535
</properties>
3636

3737
<dependencies>
38-
<dependency>
39-
<groupId>org.projectlombok</groupId>
40-
<artifactId>lombok</artifactId>
41-
<version>1.18.24</version>
42-
</dependency>
4338
<dependency>
4439
<groupId>software.amazon.awssdk</groupId>
4540
<artifactId>sqs</artifactId>
@@ -109,13 +104,6 @@
109104
<source>17</source>
110105
<target>17</target>
111106
<encoding>UTF-8</encoding>
112-
<annotationProcessorPaths>
113-
<path>
114-
<groupId>org.projectlombok</groupId>
115-
<artifactId>lombok</artifactId>
116-
<version>1.18.24</version>
117-
</path>
118-
</annotationProcessorPaths>
119107
</configuration>
120108
</plugin>
121109
<plugin>

src/main/java/com/amazon/sqs/javamessaging/SQSQueueDestination.java

Lines changed: 56 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,12 @@
1616

1717
import jakarta.jms.Destination;
1818
import jakarta.jms.Queue;
19-
import lombok.EqualsAndHashCode;
20-
import lombok.Getter;
21-
import lombok.ToString;
2219

2320
/**
2421
* A SQSQueueDestination object encapsulates a queue name and SQS specific queue
2522
* URL. This is the way a client specifies the identity of a queue to JMS API
2623
* methods.
2724
*/
28-
@Getter
29-
@ToString(exclude = {"isFifo"})
30-
@EqualsAndHashCode
3125
public class SQSQueueDestination implements Destination, Queue {
3226

3327
private final String queueName;
@@ -41,4 +35,60 @@ public class SQSQueueDestination implements Destination, Queue {
4135
this.queueUrl = queueUrl;
4236
this.isFifo = this.queueName.endsWith(".fifo");
4337
}
38+
39+
/**
40+
* Returns the name of this queue.
41+
*
42+
* @return queueName
43+
*/
44+
@Override
45+
public String getQueueName() {
46+
return this.queueName;
47+
}
48+
49+
/**
50+
* Returns the queueUrl of this queue.
51+
*
52+
* @return queueUrl
53+
*/
54+
public String getQueueUrl() {
55+
return this.queueUrl;
56+
}
57+
58+
public boolean isFifo() {
59+
return this.isFifo;
60+
}
61+
62+
@Override
63+
public String toString() {
64+
return "SQSDestination [queueName=" + queueName + ", queueUrl=" + queueUrl + "]";
65+
}
66+
67+
@Override
68+
public int hashCode() {
69+
final int prime = 31;
70+
int result = 1;
71+
result = prime * result + ((queueName == null) ? 0 : queueName.hashCode());
72+
result = prime * result + ((queueUrl == null) ? 0 : queueUrl.hashCode());
73+
return result;
74+
}
75+
76+
@Override
77+
public boolean equals(Object obj) {
78+
if (this == obj)
79+
return true;
80+
if (obj == null)
81+
return false;
82+
if (getClass() != obj.getClass())
83+
return false;
84+
SQSQueueDestination other = (SQSQueueDestination) obj;
85+
if (queueName == null) {
86+
if (other.queueName != null)
87+
return false;
88+
} else if (!queueName.equals(other.queueName))
89+
return false;
90+
if (queueUrl == null) {
91+
return other.queueUrl == null;
92+
} else return queueUrl.equals(other.queueUrl);
93+
}
4494
}

src/main/java/com/amazon/sqs/javamessaging/acknowledge/SQSMessageIdentifier.java

Lines changed: 77 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,31 +16,19 @@
1616

1717
import com.amazon.sqs.javamessaging.message.SQSMessage;
1818
import jakarta.jms.JMSException;
19-
import lombok.EqualsAndHashCode;
20-
import lombok.Getter;
21-
import lombok.ToString;
2219

2320
/**
2421
* Identifies an SQS message, when (negative)acknowledging the message
2522
*/
26-
@ToString(onlyExplicitlyIncluded = true)
27-
@EqualsAndHashCode(onlyExplicitlyIncluded = true)
28-
@Getter
2923
public class SQSMessageIdentifier {
3024

3125
// The queueUrl where the message was sent or received from
32-
@ToString.Include
33-
@EqualsAndHashCode.Include
3426
private final String queueUrl;
3527

3628
// The receipt handle returned after the delivery of the message from SQS
37-
@ToString.Include
38-
@EqualsAndHashCode.Include
3929
private final String receiptHandle;
4030

4131
// The SQS message id assigned on send.
42-
@ToString.Include
43-
@EqualsAndHashCode.Include
4432
private final String sqsMessageId;
4533

4634
// The group id to which the message belongs
@@ -63,4 +51,81 @@ public SQSMessageIdentifier(String queueUrl, String receiptHandle, String sqsMes
6351
public static SQSMessageIdentifier fromSQSMessage(SQSMessage sqsMessage) throws JMSException {
6452
return new SQSMessageIdentifier(sqsMessage.getQueueUrl(), sqsMessage.getReceiptHandle(), sqsMessage.getSQSMessageId(), sqsMessage.getSQSMessageGroupId());
6553
}
54+
55+
/**
56+
* Returns the queueUrl where the message was sent or received from.
57+
*
58+
* @return queueUrl
59+
*/
60+
public String getQueueUrl() {
61+
return this.queueUrl;
62+
}
63+
64+
/**
65+
* Returns the receipt handle returned after the delivery of the message
66+
* from SQS.
67+
*
68+
* @return receiptHandle
69+
*/
70+
public String getReceiptHandle() {
71+
return this.receiptHandle;
72+
}
73+
74+
/**
75+
* Returns the SQS message id assigned on send.
76+
*
77+
* @return sqsMessageId
78+
*/
79+
public String getSQSMessageID() {
80+
return this.sqsMessageId;
81+
}
82+
83+
/**
84+
* Returns the group id to which the message belongs. Non-null only for messages received from FIFO queues.
85+
*
86+
* @return groupId
87+
*/
88+
public String getGroupId() {
89+
return this.groupId;
90+
}
91+
92+
@Override
93+
public int hashCode() {
94+
final int prime = 31;
95+
int result = 1;
96+
result = prime * result + ((queueUrl == null) ? 0 : queueUrl.hashCode());
97+
result = prime * result + ((receiptHandle == null) ? 0 : receiptHandle.hashCode());
98+
result = prime * result + ((sqsMessageId == null) ? 0 : sqsMessageId.hashCode());
99+
return result;
100+
}
101+
102+
@Override
103+
public boolean equals(Object obj) {
104+
if (this == obj)
105+
return true;
106+
if (obj == null)
107+
return false;
108+
if (getClass() != obj.getClass())
109+
return false;
110+
SQSMessageIdentifier other = (SQSMessageIdentifier) obj;
111+
if (queueUrl == null) {
112+
if (other.queueUrl != null)
113+
return false;
114+
} else if (!queueUrl.equals(other.queueUrl))
115+
return false;
116+
if (receiptHandle == null) {
117+
if (other.receiptHandle != null)
118+
return false;
119+
} else if (!receiptHandle.equals(other.receiptHandle))
120+
return false;
121+
if (sqsMessageId == null) {
122+
return other.sqsMessageId == null;
123+
} else return sqsMessageId.equals(other.sqsMessageId);
124+
}
125+
126+
@Override
127+
public String toString() {
128+
return "SQSMessageIdentifier [queueUrl=" + queueUrl + ", receiptHandle=" + receiptHandle +
129+
", sqsMessageId=" + sqsMessageId + "]";
130+
}
66131
}

0 commit comments

Comments
 (0)