Skip to content

Commit face9fc

Browse files
snazyrakesh-das08
authored andcommitted
Let 'spotless' run on all java source directories (apache#1205)
Only runs on 'main', 'test', 'testFixtures', but not on others like 'intTest'. This change fixes this.
1 parent ee0ea06 commit face9fc

File tree

7 files changed

+9
-13
lines changed

7 files changed

+9
-13
lines changed

build-logic/src/main/kotlin/polaris-java.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ tasks.withType(Jar::class).configureEach {
152152

153153
spotless {
154154
java {
155-
target("src/main/java/**/*.java", "src/testFixtures/java/**/*.java", "src/test/java/**/*.java")
155+
target("src/*/java/**/*.java")
156156
googleJavaFormat()
157157
licenseHeaderFile(rootProject.file("codestyle/copyright-header-java.txt"))
158158
endWithNewline()

quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusManagementServiceIT.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,4 @@
2222
import org.apache.polaris.service.it.test.PolarisManagementServiceIntegrationTest;
2323

2424
@QuarkusIntegrationTest
25-
public class QuarkusManagementServiceIT
26-
extends PolarisManagementServiceIntegrationTest {}
25+
public class QuarkusManagementServiceIT extends PolarisManagementServiceIntegrationTest {}

quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewAwsIT.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@
2727
import org.junit.jupiter.api.io.TempDir;
2828

2929
@QuarkusIntegrationTest
30-
public class QuarkusRestCatalogViewAwsIT
31-
extends PolarisRestCatalogViewAwsIntegrationTest {
30+
public class QuarkusRestCatalogViewAwsIT extends PolarisRestCatalogViewAwsIntegrationTest {
3231

3332
@BeforeEach
3433
public void setUpTempDir(@TempDir Path tempDir) throws Exception {

quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewAzureIT.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@
2727
import org.junit.jupiter.api.io.TempDir;
2828

2929
@QuarkusIntegrationTest
30-
public class QuarkusRestCatalogViewAzureIT
31-
extends PolarisRestCatalogViewAzureIntegrationTest {
30+
public class QuarkusRestCatalogViewAzureIT extends PolarisRestCatalogViewAzureIntegrationTest {
3231

3332
@BeforeEach
3433
public void setUpTempDir(@TempDir Path tempDir) throws Exception {

quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewFileIT.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@
2727
import org.junit.jupiter.api.io.TempDir;
2828

2929
@QuarkusIntegrationTest
30-
public class QuarkusRestCatalogViewFileIT
31-
extends PolarisRestCatalogViewFileIntegrationTest {
30+
public class QuarkusRestCatalogViewFileIT extends PolarisRestCatalogViewFileIntegrationTest {
3231

3332
@BeforeEach
3433
public void setUpTempDir(@TempDir Path tempDir) throws Exception {

quarkus/service/src/intTest/java/org/apache/polaris/service/quarkus/it/QuarkusRestCatalogViewGcpIT.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@
2727
import org.junit.jupiter.api.io.TempDir;
2828

2929
@QuarkusIntegrationTest
30-
public class QuarkusRestCatalogViewGcpIT
31-
extends PolarisRestCatalogViewGcpIntegrationTest {
30+
public class QuarkusRestCatalogViewGcpIT extends PolarisRestCatalogViewGcpIntegrationTest {
3231

3332
@BeforeEach
3433
public void setUpTempDir(@TempDir Path tempDir) throws Exception {

tools/version/src/jarTest/java/org/apache/polaris/version/TestPolarisVersion.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
package org.apache.polaris.version;
2020

2121
import static java.lang.String.format;
22-
import static org.apache.polaris.version.PolarisVersion.getBuildGitTag;
2322
import static org.apache.polaris.version.PolarisVersion.getBuildGitHead;
23+
import static org.apache.polaris.version.PolarisVersion.getBuildGitTag;
2424
import static org.apache.polaris.version.PolarisVersion.getBuildJavaVersion;
2525
import static org.apache.polaris.version.PolarisVersion.getBuildReleasedVersion;
2626
import static org.apache.polaris.version.PolarisVersion.getBuildSystem;
@@ -108,6 +108,7 @@ static Stream<Arguments> noticeLicense() {
108108
return Stream.of(
109109
Arguments.arguments("NOTICE", (Supplier<String>) PolarisVersion::readNoticeFile),
110110
Arguments.arguments("LICENSE", (Supplier<String>) PolarisVersion::readSourceLicenseFile));
111-
//Arguments.arguments(// "LICENSE-BINARY-DIST", (Supplier<String>) PolarisVersion::readBinaryLicenseFile));
111+
// Arguments.arguments(// "LICENSE-BINARY-DIST", (Supplier<String>)
112+
// PolarisVersion::readBinaryLicenseFile));
112113
}
113114
}

0 commit comments

Comments
 (0)