Skip to content

Let 'spotless' run on all java source directories #1205

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
merged 1 commit into from
Mar 19, 2025
Merged

Let 'spotless' run on all java source directories #1205

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
2 changes: 1 addition & 1 deletion build-logic/src/main/kotlin/polaris-java.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ tasks.withType(Jar::class).configureEach {

spotless {
java {
target("src/main/java/**/*.java", "src/testFixtures/java/**/*.java", "src/test/java/**/*.java")
target("src/*/java/**/*.java")
googleJavaFormat()
licenseHeaderFile(rootProject.file("codestyle/copyright-header-java.txt"))
endWithNewline()
Expand Down
3 changes: 1 addition & 2 deletions ...ce/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusManagementServiceIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,4 @@
import org.apache.polaris.service.it.test.PolarisManagementServiceIntegrationTest;

@QuarkusIntegrationTest
public class QuarkusManagementServiceIT
extends PolarisManagementServiceIntegrationTest {}
public class QuarkusManagementServiceIT extends PolarisManagementServiceIntegrationTest {}
3 changes: 1 addition & 2 deletions ...e/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewAwsIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@
import org.junit.jupiter.api.io.TempDir;

@QuarkusIntegrationTest
public class QuarkusRestCatalogViewAwsIT
extends PolarisRestCatalogViewAwsIntegrationTest {
public class QuarkusRestCatalogViewAwsIT extends PolarisRestCatalogViewAwsIntegrationTest {

@BeforeEach
public void setUpTempDir(@TempDir Path tempDir) throws Exception {
Expand Down
3 changes: 1 addition & 2 deletions ...src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewAzureIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@
import org.junit.jupiter.api.io.TempDir;

@QuarkusIntegrationTest
public class QuarkusRestCatalogViewAzureIT
extends PolarisRestCatalogViewAzureIntegrationTest {
public class QuarkusRestCatalogViewAzureIT extends PolarisRestCatalogViewAzureIntegrationTest {

@BeforeEach
public void setUpTempDir(@TempDir Path tempDir) throws Exception {
Expand Down
3 changes: 1 addition & 2 deletions .../src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewFileIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@
import org.junit.jupiter.api.io.TempDir;

@QuarkusIntegrationTest
public class QuarkusRestCatalogViewFileIT
extends PolarisRestCatalogViewFileIntegrationTest {
public class QuarkusRestCatalogViewFileIT extends PolarisRestCatalogViewFileIntegrationTest {

@BeforeEach
public void setUpTempDir(@TempDir Path tempDir) throws Exception {
Expand Down
3 changes: 1 addition & 2 deletions ...e/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewGcpIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@
import org.junit.jupiter.api.io.TempDir;

@QuarkusIntegrationTest
public class QuarkusRestCatalogViewGcpIT
extends PolarisRestCatalogViewGcpIntegrationTest {
public class QuarkusRestCatalogViewGcpIT extends PolarisRestCatalogViewGcpIntegrationTest {

@BeforeEach
public void setUpTempDir(@TempDir Path tempDir) throws Exception {
Expand Down
5 changes: 3 additions & 2 deletions tools/version/src/jarTest/java/org/apache/polaris/version/TestPolarisVersion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
package org.apache.polaris.version;

import static java.lang.String.format;
import static org.apache.polaris.version.PolarisVersion.getBuildGitTag;
import static org.apache.polaris.version.PolarisVersion.getBuildGitHead;
import static org.apache.polaris.version.PolarisVersion.getBuildGitTag;
import static org.apache.polaris.version.PolarisVersion.getBuildJavaVersion;
import static org.apache.polaris.version.PolarisVersion.getBuildReleasedVersion;
import static org.apache.polaris.version.PolarisVersion.getBuildSystem;
Expand Down Expand Up @@ -108,6 +108,7 @@ static Stream<Arguments> noticeLicense() {
return Stream.of(
Arguments.arguments("NOTICE", (Supplier<String>) PolarisVersion::readNoticeFile),
Arguments.arguments("LICENSE", (Supplier<String>) PolarisVersion::readSourceLicenseFile));
//Arguments.arguments(// "LICENSE-BINARY-DIST", (Supplier<String>) PolarisVersion::readBinaryLicenseFile));
// Arguments.arguments(// "LICENSE-BINARY-DIST", (Supplier<String>)
// PolarisVersion::readBinaryLicenseFile));
}
}