Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 19 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ buildscript {
}

plugins {
id 'com.diffplug.spotless' version 'latest.release'
id 'com.gradleup.shadow' version 'latest.release'
id 'org.sonarqube' version 'latest.release'
id 'jacoco-report-aggregation'
Expand All @@ -16,6 +17,15 @@ plugins {
allprojects {
apply plugin: 'java-library'
apply plugin: 'jacoco'
apply plugin: 'com.diffplug.spotless'

spotless {
format 'misc', {
target '*.gradle', '*.md', '*.yml', '.github/**/*.yml', '.editorconfig', '.gitignore', '.gitattributes'
trimTrailingWhitespace()
endWithNewline()
}
}

version = '1.48.0-SNAPSHOT'

Expand Down Expand Up @@ -49,6 +59,15 @@ allprojects {
}

subprojects {
spotless {
java {
importOrder('#', 'java', 'javax', 'org', 'com', '')
removeUnusedImports()
trimTrailingWhitespace()
endWithNewline()
}
}

dependencies {
implementation 'org.slf4j:slf4j-api:latest.release'

Expand Down Expand Up @@ -197,4 +216,3 @@ tasks.named('testCodeCoverageReport', JacocoReport) {
tasks.named('check') {
dependsOn tasks.named('testCodeCoverageReport', JacocoReport)
}

23 changes: 22 additions & 1 deletion buildscript-gradle.lockfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,25 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.diffplug.durian:durian-collect:1.2.0=classpath
com.diffplug.durian:durian-core:1.2.0=classpath
com.diffplug.durian:durian-io:1.2.0=classpath
com.diffplug.durian:durian-swt.os:4.3.0=classpath
com.diffplug.spotless:com.diffplug.spotless.gradle.plugin:8.11.0=classpath
com.diffplug.spotless:spotless-lib-extra:4.11.0=classpath
com.diffplug.spotless:spotless-lib:4.11.0=classpath
com.diffplug.spotless:spotless-plugin-gradle:8.11.0=classpath
com.fasterxml.woodstox:woodstox-core:7.1.1=classpath
com.googlecode.concurrent-trees:concurrent-trees:2.6.1=classpath
com.googlecode.javaewah:JavaEWAH:1.2.3=classpath
com.gradleup.shadow:com.gradleup.shadow.gradle.plugin:9.6.1=classpath
com.gradleup.shadow:shadow-gradle-plugin:9.6.1=classpath
commons-codec:commons-codec:1.22.0=classpath
com.squareup.okhttp3:okhttp:4.12.0=classpath
com.squareup.okio:okio-jvm:3.6.0=classpath
com.squareup.okio:okio:3.6.0=classpath
commons-codec:commons-codec:1.22.1=classpath
commons-io:commons-io:2.22.0=classpath
dev.equo.ide:solstice:1.8.2=classpath
org.apache.ant:ant-launcher:1.10.17=classpath
org.apache.ant:ant:1.10.17=classpath
org.apache.logging.log4j:log4j-api:2.26.1=classpath
Expand All @@ -16,12 +30,19 @@ org.apache.maven:maven-xml:4.0.0-rc-5=classpath
org.codehaus.plexus:plexus-utils:4.0.3=classpath
org.codehaus.plexus:plexus-xml:4.1.1=classpath
org.codehaus.woodstox:stax2-api:4.2.2=classpath
org.eclipse.jgit:org.eclipse.jgit:7.8.0.202609011348-r=classpath
org.eclipse.platform:org.eclipse.osgi:3.24.300=classpath
org.jdom:jdom2:2.0.6.1=classpath
org.jetbrains.kotlin:kotlin-metadata-jvm:2.4.10=classpath
org.jetbrains.kotlin:kotlin-stdlib-common:2.4.10=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10=classpath
org.jetbrains.kotlin:kotlin-stdlib:2.4.10=classpath
org.jetbrains:annotations:13.0=classpath
org.slf4j:slf4j-api:2.0.18=classpath
org.sonarqube:org.sonarqube.gradle.plugin:7.6.0.18749=classpath
org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:7.6.0.18749=classpath
org.sonarsource.scanner.lib:sonar-scanner-java-library-shaded:4.3.0.11766=classpath
org.tukaani:xz:1.9=classpath
org.vafer:jdependency:2.16=classpath
empty=
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
import de.bwaldvogel.mongo.bson.Document;
import de.bwaldvogel.mongo.bson.Json;
import de.bwaldvogel.mongo.exception.BadValueException;
import de.bwaldvogel.mongo.exception.CannotTraverseElementException;
import de.bwaldvogel.mongo.exception.ConflictingUpdateOperatorsException;
import de.bwaldvogel.mongo.exception.FailedToParseException;
import de.bwaldvogel.mongo.exception.ImmutableFieldException;
import de.bwaldvogel.mongo.exception.MongoServerError;
import de.bwaldvogel.mongo.exception.CannotTraverseElementException;
import de.bwaldvogel.mongo.exception.TypeMismatchException;

class FieldUpdates {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package de.bwaldvogel.mongo.exception;

import java.io.Serial;

import static de.bwaldvogel.mongo.backend.Utils.describeType;

import java.io.Serial;

public class UnsupportedConversionError extends ConversionFailureException {

@Serial
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import java.util.stream.Collectors;
import java.util.stream.Stream;

import de.bwaldvogel.mongo.backend.CollectionUtils;
import de.bwaldvogel.mongo.backend.AbstractCursor;
import de.bwaldvogel.mongo.backend.CollectionUtils;
import de.bwaldvogel.mongo.bson.Document;

public class OplogCursor extends AbstractCursor {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,11 @@
import java.util.List;
import java.util.Set;

import de.bwaldvogel.mongo.backend.Command;

import de.bwaldvogel.mongo.backend.DatabaseCommand;

import org.junit.jupiter.api.Test;

import de.bwaldvogel.mongo.MongoBackend;
import de.bwaldvogel.mongo.backend.Command;
import de.bwaldvogel.mongo.backend.DatabaseCommand;
import de.bwaldvogel.mongo.bson.Document;
import de.bwaldvogel.mongo.wire.message.MessageFlag;
import de.bwaldvogel.mongo.wire.message.MessageHeader;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ public Account(BigDecimal total) {
public BigDecimal getTotal() {
return total;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@

import java.util.Date;

import de.bwaldvogel.mongo.backend.Command;

import org.bson.Document;
import org.junit.jupiter.api.Assumptions;
import org.junit.jupiter.api.BeforeEach;
Expand All @@ -17,6 +15,7 @@
import com.mongodb.MongoCommandException;

import de.bwaldvogel.mongo.backend.AbstractBackendTest;
import de.bwaldvogel.mongo.backend.Command;

public class RealMongoBackendTest extends AbstractBackendTest {

Expand Down
Loading