diff --git a/common/pom.xml b/common/pom.xml index 292fa7e7..664325e7 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -32,11 +32,6 @@ - - org.jetbrains - annotations - - org.assertj diff --git a/common/src/main/java/com/ericsson/bss/cassandra/ecaudit/common/chronicle/AuditRecordReadMarshallable.java b/common/src/main/java/com/ericsson/bss/cassandra/ecaudit/common/chronicle/AuditRecordReadMarshallable.java index df60203f..724a3c1a 100644 --- a/common/src/main/java/com/ericsson/bss/cassandra/ecaudit/common/chronicle/AuditRecordReadMarshallable.java +++ b/common/src/main/java/com/ericsson/bss/cassandra/ecaudit/common/chronicle/AuditRecordReadMarshallable.java @@ -25,14 +25,13 @@ import net.openhft.chronicle.core.io.IORuntimeException; import net.openhft.chronicle.wire.ReadMarshallable; import net.openhft.chronicle.wire.WireIn; -import org.jetbrains.annotations.NotNull; public class AuditRecordReadMarshallable implements ReadMarshallable { private StoredAuditRecord auditRecord; @Override - public void readMarshallable(@NotNull WireIn wire) throws IORuntimeException + public void readMarshallable(WireIn wire) throws IORuntimeException { if (auditRecord != null) { diff --git a/common/src/main/java/com/ericsson/bss/cassandra/ecaudit/common/chronicle/AuditRecordWriteMarshallable.java b/common/src/main/java/com/ericsson/bss/cassandra/ecaudit/common/chronicle/AuditRecordWriteMarshallable.java index 74b6dead..8bdc165e 100644 --- a/common/src/main/java/com/ericsson/bss/cassandra/ecaudit/common/chronicle/AuditRecordWriteMarshallable.java +++ b/common/src/main/java/com/ericsson/bss/cassandra/ecaudit/common/chronicle/AuditRecordWriteMarshallable.java @@ -19,7 +19,6 @@ import com.ericsson.bss.cassandra.ecaudit.common.record.AuditRecord; import net.openhft.chronicle.wire.WireOut; import net.openhft.chronicle.wire.WriteMarshallable; -import org.jetbrains.annotations.NotNull; public class AuditRecordWriteMarshallable implements WriteMarshallable { @@ -33,7 +32,7 @@ public AuditRecordWriteMarshallable(AuditRecord auditRecord, FieldSelector confi } @Override - public void writeMarshallable(@NotNull WireOut wire) + public void writeMarshallable(WireOut wire) { // Mandatory fields wire.write(WireTags.KEY_VERSION).int16(WireTags.VALUE_VERSION_CURRENT); diff --git a/ecaudit/pom.xml b/ecaudit/pom.xml index 500c7574..e715f4e6 100644 --- a/ecaudit/pom.xml +++ b/ecaudit/pom.xml @@ -41,10 +41,6 @@ common_${artifact.flavor.version} ${project.version} - - org.jetbrains - annotations - org.assertj diff --git a/ecaudit/src/main/java/com/ericsson/bss/cassandra/ecaudit/auth/ConnectionResource.java b/ecaudit/src/main/java/com/ericsson/bss/cassandra/ecaudit/auth/ConnectionResource.java index 13dc3e9a..6923a97b 100644 --- a/ecaudit/src/main/java/com/ericsson/bss/cassandra/ecaudit/auth/ConnectionResource.java +++ b/ecaudit/src/main/java/com/ericsson/bss/cassandra/ecaudit/auth/ConnectionResource.java @@ -23,7 +23,6 @@ import org.apache.commons.lang3.StringUtils; import org.apache.cassandra.auth.IResource; import org.apache.cassandra.auth.Permission; -import org.jetbrains.annotations.NotNull; /** * IResource implementation representing database connections. @@ -116,7 +115,7 @@ public Set applicablePermissions() } @Override - public int compareTo(@NotNull ConnectionResource o) + public int compareTo(ConnectionResource o) { return this.getName().compareTo(o.getName()); } diff --git a/eclog/src/test/java/com/ericsson/bss/cassandra/ecaudit/eclog/TestLogPrinter.java b/eclog/src/test/java/com/ericsson/bss/cassandra/ecaudit/eclog/TestLogPrinter.java index b7ee62ad..179b216a 100644 --- a/eclog/src/test/java/com/ericsson/bss/cassandra/ecaudit/eclog/TestLogPrinter.java +++ b/eclog/src/test/java/com/ericsson/bss/cassandra/ecaudit/eclog/TestLogPrinter.java @@ -36,7 +36,6 @@ import com.ericsson.bss.cassandra.ecaudit.common.record.Status; import com.ericsson.bss.cassandra.ecaudit.common.record.StoredAuditRecord; import com.ericsson.bss.cassandra.ecaudit.eclog.config.EcLogYamlConfig; -import org.jetbrains.annotations.NotNull; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; import org.mockito.stubbing.OngoingStubbing; @@ -241,7 +240,6 @@ public void testAvailableFieldFunctions() assertThat(availableFieldFunctions.get("TIMESTAMP").apply(FULL_RECORD)).isEqualTo("123"); } - @NotNull private QueueReader givenReaderWithSingleRecord(StoredAuditRecord authRecord) { QueueReader reader = mock(QueueReader.class); @@ -250,7 +248,6 @@ private QueueReader givenReaderWithSingleRecord(StoredAuditRecord authRecord) return reader; } - @NotNull private EcLogYamlConfig mockConfig(String format) { EcLogYamlConfig config = mock(EcLogYamlConfig.class); diff --git a/pom.xml b/pom.xml index 24a067d3..4048d103 100644 --- a/pom.xml +++ b/pom.xml @@ -57,7 +57,6 @@ pmd-rules.xml 1.4 - 19.0.0 3.22.0 4.16.0 @@ -102,11 +101,6 @@ commons-cli ${commons-cli.version} - - org.jetbrains - annotations - ${annotations.version} - org.assertj