Skip to content

Replacing code that uses Java API marked for removal #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
the-thing merged 1 commit into from
Oct 30, 2026
+59 −59
Merged

Replacing code that uses Java API marked for removal #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions mina-core/src/test/java/org/apache/mina/filter/codec/CumulativeProtocolDecoderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public void testCumulation() throws Exception {

decoder.decode(session, buf, session.getDecoderOutput());
assertEquals(1, session.getDecoderOutputQueue().size());
assertEquals(new Integer(1), session.getDecoderOutputQueue().poll());
assertEquals(1, session.getDecoderOutputQueue().poll());
assertEquals(buf.limit(), buf.position());
}

Expand Down Expand Up @@ -202,7 +202,7 @@ protected boolean doDecode(IoSession session, IoBuffer in, ProtocolDecoderOutput
return false;
}

out.write(new Integer(in.getInt()));
out.write(in.getInt());
return true;
}
}
Expand Down
4 changes: 2 additions & 2 deletions mina-core/src/test/java/org/apache/mina/filter/executor/ExecutorFilterRegressionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public void testEventOrder() throws Throwable {
//executor.setKeepAliveTime(3, TimeUnit.SECONDS);

for (int i = 0; i < loop; i++) {
Integer objI = new Integer(i);
Integer objI = i;

for (int j = end; j >= 0; j--) {
filter.messageReceived(nextFilter, sessions[j], objI);
Expand Down Expand Up @@ -102,7 +102,7 @@ public EventOrderCounter() {

public synchronized void setLastCount(Integer newCount) {
if (lastCount != null) {
assertEquals(lastCount.intValue() + 1, newCount.intValue());
assertEquals(lastCount + 1, newCount.intValue());
}

lastCount = newCount;
Expand Down
2 changes: 1 addition & 1 deletion mina-core/src/test/java/org/apache/mina/proxy/NTLMTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ public void testType3Message() throws Exception {
assertEquals(expectedTargetInfoBlock, asHex(targetInfo));

assertEquals("DOMAIN",
NTLMUtilities.extractTargetNameFromType2Message(challengePacket, new Integer(serverFlags)));
NTLMUtilities.extractTargetNameFromType2Message(challengePacket, serverFlags));

serverFlags = 0x00000001 | 0x00000200;
String msgType3 = asHex(NTLMUtilities.createType3Message("user", "SecREt01", challenge, "DOMAIN",
Expand Down
8 changes: 4 additions & 4 deletions mina-core/src/test/java/org/apache/mina/transport/AbstractTrafficControlTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,19 +172,19 @@ private void write(IoSession session, String s) throws Exception {
}

private int read(IoSession session) throws Exception {
int pos = ((Integer) session.getAttribute("pos")).intValue();
int pos = (Integer) session.getAttribute("pos");
for (int i = 0; i < 10 && pos == getReceived(session).length(); i++) {
Object lock = session.getAttribute("lock");
lock.wait(200);
}
session.setAttribute("pos", new Integer(pos + 1));
session.setAttribute("pos", pos + 1);
String received = getReceived(session);
assertTrue(received.length() > pos);
return getReceived(session).charAt(pos);
}

private boolean canRead(IoSession session) throws Exception {
int pos = ((Integer) session.getAttribute("pos")).intValue();
int pos = (Integer) session.getAttribute("pos");
Object lock = session.getAttribute("lock");
lock.wait(250);
String received = getReceived(session);
Expand All @@ -210,7 +210,7 @@ public ClientIoHandler() {
@Override
public void sessionCreated(IoSession session) throws Exception {
super.sessionCreated(session);
session.setAttribute("pos", new Integer(0));
session.setAttribute("pos", 0);
session.setAttribute("received", new StringBuffer());
session.setAttribute("sent", new StringBuffer());
session.setAttribute("lock", new Object());
Expand Down
84 changes: 42 additions & 42 deletions mina-core/src/test/java/org/apache/mina/util/CircularQueueTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public void testExpandingRotation() {
// make expansion happen
int oldCapacity = q.capacity();
for (int j = q.capacity(); j >= 0; j--) {
q.offer(new Integer(++pushCount));
q.offer(++pushCount);
}

assertTrue(q.capacity() > oldCapacity);
Expand All @@ -69,7 +69,7 @@ public void testExpandingRotation() {

private void testRotation0(CircularQueue<Integer> q) {
for (int i = 0; i < q.capacity() * 7 / 4; i++) {
q.offer(new Integer(++pushCount));
q.offer(++pushCount);
assertEquals(++popCount, q.poll().intValue());
}
}
Expand All @@ -79,23 +79,23 @@ public void testRandomAddOnQueue() {
CircularQueue<Integer> q = new CircularQueue<>();
// Create a queue with 5 elements and capacity 8;
for (int i = 0; i < 5; i++) {
q.offer(new Integer(i));
q.offer(i);
}

q.add(0, new Integer(100));
q.add(3, new Integer(200));
q.add(7, new Integer(300));
q.add(0, 100);
q.add(3, 200);
q.add(7, 300);

Iterator<Integer> i = q.iterator();
assertEquals(8, q.size());
assertEquals(new Integer(100), i.next());
assertEquals(new Integer(0), i.next());
assertEquals(new Integer(1), i.next());
assertEquals(new Integer(200), i.next());
assertEquals(new Integer(2), i.next());
assertEquals(new Integer(3), i.next());
assertEquals(new Integer(4), i.next());
assertEquals(new Integer(300), i.next());
assertEquals(100, i.next().intValue());
assertEquals(0, i.next().intValue());
assertEquals(1, i.next().intValue());
assertEquals(200, i.next().intValue());
assertEquals(2, i.next().intValue());
assertEquals(3, i.next().intValue());
assertEquals(4, i.next().intValue());
assertEquals(Integer.valueOf(300), i.next());

try {
i.next();
Expand All @@ -110,27 +110,27 @@ public void testRandomAddOnQueue() {
public void testRandomAddOnRotatedQueue() {
CircularQueue<Integer> q = getRotatedQueue();

q.add(0, new Integer(100)); // addFirst
q.add(2, new Integer(200));
q.add(4, new Integer(300));
q.add(10, new Integer(400));
q.add(12, new Integer(500)); // addLast
q.add(0, 100); // addFirst
q.add(2, 200);
q.add(4, 300);
q.add(10, 400);
q.add(12, 500); // addLast

Iterator<Integer> i = q.iterator();
assertEquals(13, q.size());
assertEquals(new Integer(100), i.next());
assertEquals(new Integer(0), i.next());
assertEquals(new Integer(200), i.next());
assertEquals(new Integer(1), i.next());
assertEquals(new Integer(300), i.next());
assertEquals(new Integer(2), i.next());
assertEquals(new Integer(3), i.next());
assertEquals(new Integer(4), i.next());
assertEquals(new Integer(5), i.next());
assertEquals(new Integer(6), i.next());
assertEquals(new Integer(400), i.next());
assertEquals(new Integer(7), i.next());
assertEquals(new Integer(500), i.next());
assertEquals(100, i.next().intValue());
assertEquals(0, i.next().intValue());
assertEquals(200, i.next().intValue());
assertEquals(1, i.next().intValue());
assertEquals(Integer.valueOf(300), i.next());
assertEquals(Integer.valueOf(2), i.next());
assertEquals(Integer.valueOf(3), i.next());
assertEquals(Integer.valueOf(4), i.next());
assertEquals(Integer.valueOf(5), i.next());
assertEquals(Integer.valueOf(6), i.next());
assertEquals(Integer.valueOf(400), i.next());
assertEquals(Integer.valueOf(7), i.next());
assertEquals(Integer.valueOf(500), i.next());

try {
i.next();
Expand All @@ -147,7 +147,7 @@ public void testRandomRemoveOnQueue() {

// Create a queue with 5 elements and capacity 8;
for (int i = 0; i < 5; i++) {
q.offer(new Integer(i));
q.offer(i);
}

q.remove(0);
Expand All @@ -156,8 +156,8 @@ public void testRandomRemoveOnQueue() {

Iterator<Integer> i = q.iterator();
assertEquals(2, q.size());
assertEquals(new Integer(1), i.next());
assertEquals(new Integer(2), i.next());
assertEquals(Integer.valueOf(1), i.next());
assertEquals(Integer.valueOf(2), i.next());

try {
i.next();
Expand All @@ -179,10 +179,10 @@ public void testRandomRemoveOnRotatedQueue() {

Iterator<Integer> i = q.iterator();
assertEquals(4, q.size());
assertEquals(new Integer(1), i.next());
assertEquals(new Integer(2), i.next());
assertEquals(new Integer(5), i.next());
assertEquals(new Integer(6), i.next());
assertEquals(Integer.valueOf(1), i.next());
assertEquals(Integer.valueOf(2), i.next());
assertEquals(Integer.valueOf(5), i.next());
assertEquals(Integer.valueOf(6), i.next());

try {
i.next();
Expand Down Expand Up @@ -221,19 +221,19 @@ private CircularQueue<Integer> getRotatedQueue() {

// Ensure capacity: 16
for (int i = 0; i < 16; i++) {
q.offer(new Integer(-1));
q.offer(-1);
}
q.clear();

// Rotate it
for (int i = 0; i < 12; i++) {
q.offer(new Integer(-1));
q.offer(-1);
q.poll();
}

// Now push items
for (int i = 0; i < 8; i++) {
q.offer(new Integer(i));
q.offer(i);
}

return q;
Expand Down
16 changes: 8 additions & 8 deletions ...temachine/src/test/java/org/apache/mina/statemachine/transition/MethodTransitionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public void setUp() throws Exception {
subsetAllArgsMethod2 = Target.class.getMethod("subsetAllArgs", new Class[] { Event.class, B.class, B.class,
Boolean.TYPE });

args = new Object[] { new A(), new B(), new C(), new Integer(627438), Boolean.TRUE };
args = new Object[] { new A(), new B(), new C(), 627438, Boolean.TRUE };
context = mock(TestStateContext.class);
noArgsEvent = new Event("event", context, new Object[0]);
argsEvent = new Event("event", context, args);
Expand Down Expand Up @@ -99,8 +99,8 @@ public void testExecuteExactArgsMethodOnNoArgsEvent() throws Exception {

@Test
public void testExecuteExactArgsMethodOnArgsEvent() throws Exception {
target.exactArgs((A) args[0], (B) args[1], (C) args[2], ((Integer) args[3]).intValue(),
((Boolean) args[4]).booleanValue());
target.exactArgs((A) args[0], (B) args[1], (C) args[2], (Integer) args[3],
(Boolean) args[4]);
MethodTransition t = new MethodTransition("event", nextState, "exactArgs", target);
assertTrue(t.execute(argsEvent));
}
Expand All @@ -113,29 +113,29 @@ public void testExecuteSubsetExactArgsMethodOnNoArgsEvent() throws Exception {

@Test
public void testExecuteSubsetExactArgsMethodOnArgsEvent() throws Exception {
target.subsetExactArgs((A) args[0], (A) args[1], ((Integer) args[3]).intValue());
target.subsetExactArgs((A) args[0], (A) args[1], (Integer) args[3]);
MethodTransition t = new MethodTransition("event", nextState, "subsetExactArgs", target);
assertTrue(t.execute(argsEvent));
}

@Test
public void testExecuteAllArgsMethodOnArgsEvent() throws Exception {
target.allArgs(argsEvent, context, (A) args[0], (B) args[1], (C) args[2], ((Integer) args[3]).intValue(),
((Boolean) args[4]).booleanValue());
target.allArgs(argsEvent, context, (A) args[0], (B) args[1], (C) args[2], (Integer) args[3],
(Boolean) args[4]);
MethodTransition t = new MethodTransition("event", nextState, "allArgs", target);
assertTrue(t.execute(argsEvent));
}

@Test
public void testExecuteSubsetAllArgsMethod1OnArgsEvent() throws Exception {
target.subsetAllArgs(context, (B) args[1], (A) args[2], ((Integer) args[3]).intValue());
target.subsetAllArgs(context, (B) args[1], (A) args[2], (Integer) args[3]);
MethodTransition t = new MethodTransition("event", nextState, subsetAllArgsMethod1, target);
assertTrue(t.execute(argsEvent));
}

@Test
public void testExecuteSubsetAllArgsMethod2OnArgsEvent() throws Exception {
target.subsetAllArgs(argsEvent, (B) args[1], (B) args[2], ((Boolean) args[4]).booleanValue());
target.subsetAllArgs(argsEvent, (B) args[1], (B) args[2], (Boolean) args[4]);
MethodTransition t = new MethodTransition("event", nextState, subsetAllArgsMethod2, target);
assertTrue(t.execute(argsEvent));
}
Expand Down
Loading