natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove AssertJ from the production code 

patch by Stefan Miklosovic; reviewed by Brandon Williams for CASSANDRA-18700
This commit is contained in:
Stefan Miklosovic 2023-07-28 17:09:52 +02:00
parent b4b9f31983
commit a0fdda1976
No known key found for this signature in database
GPG Key ID: 32F35CB2F546D93E
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build.xml
View File

@ -677,7 +677,7 @@
this that the new assertj's `assertj-parent-pom` depends on. -->
<dependency groupId="org.junit" artifactId="junit-bom" version="5.6.0" type="pom" scope="test"/>
<!-- when updating assertj, make sure to also update the corresponding junit-bom dependency -->
<dependency groupId="org.assertj" artifactId="assertj-core" version="3.15.0" scope="provided"/>
<dependency groupId="org.assertj" artifactId="assertj-core" version="3.15.0" scope="test"/>
<dependency groupId="org.awaitility" artifactId="awaitility" version="4.0.3" scope="test">
<exclusion groupId="org.hamcrest" artifactId="hamcrest"/>
</dependency>
@ -739,6 +739,7 @@
version="${version}"
relativePath="${final.name}-parent.pom"/>
<dependency groupId="junit" artifactId="junit"/>
<dependency groupId="org.assertj" artifactId="assertj-core"/>
<dependency groupId="commons-io" artifactId="commons-io"/>
<dependency groupId="org.mockito" artifactId="mockito-core"/>
<dependency groupId="org.quicktheories" artifactId="quicktheories"/>

3
src/java/org/apache/cassandra/net/BufferPoolAllocator.java
View File

@ -19,6 +19,8 @@ package org.apache.cassandra.net;
import java.nio.ByteBuffer;
import com.google.common.annotations.VisibleForTesting;
import io.netty.buffer.AbstractByteBufAllocator;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
@ -26,7 +28,6 @@ import io.netty.buffer.UnpooledUnsafeDirectByteBuf;
import org.apache.cassandra.io.compress.BufferType;
import org.apache.cassandra.utils.memory.BufferPool;
import org.apache.cassandra.utils.memory.BufferPools;
import org.assertj.core.util.VisibleForTesting;
import static java.lang.Integer.max;

2
src/java/org/apache/cassandra/service/reads/range/RangeCommands.java
View File

@ -18,6 +18,7 @@
package org.apache.cassandra.service.reads.range;
import com.google.common.annotations.VisibleForTesting;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -30,7 +31,6 @@ import org.apache.cassandra.db.partitions.PartitionIterator;
import org.apache.cassandra.index.Index;
import org.apache.cassandra.tracing.Tracing;
import org.apache.cassandra.utils.FBUtilities;
import org.assertj.core.util.VisibleForTesting;
public class RangeCommands
{