Skip to content
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.

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

Issue #8328: Change name of checkstyle types to be close to real java types - enums #8337

Merged
merged 1 commit into from Jun 28, 2020

Conversation

gaurabdg
Copy link
Contributor

@gaurabdg gaurabdg commented Jun 24, 2020

#8328

Refactored -

  1. ClosingParensOption
  2. ElementStyleOption
  3. TrailingArrayCommaOption

All other enums already have Option suffix already and just required a bit of renaming in property_types.html related files

@strkkk
Copy link
Member

strkkk commented Jun 26, 2020

@gaurabdg I restarted wercker, but if it fails again - please take a look

Copy link
Member

@strkkk strkkk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please fix CI

@strkkk
Copy link
Member

strkkk commented Jun 26, 2020

There is a failure in spring-integration

> Task :spring-integration-core:compileKotlin

FAILURE: Build failed with an exception.

* What went wrong:
Execution failed for task ':spring-integration-test-support:checkstyleMain'.
> Unable to create Root Module: config {/pipeline/source/.ci-temp/spring-integration/src/checkstyle/checkstyle.xml}, classpath {/pipeline/source/.ci-temp/spring-integration/spring-integration-test-support/build/classes/java/main:/pipeline/source/.ci-temp/spring-integration/spring-integration-test-support/build/classes/kotlin/main:/pipeline/source/.ci-temp/spring-integration/spring-integration-test-support/build/resources/main:/root/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-library/2.2/cf530c8a0bc993487c64e940ae639bb4a6104dc6/hamcrest-library-2.2.jar:/root/.gradle/caches/modules-2/files-2.1/junit/junit/4.13/e49ccba652b735c93bd6e6f59760d8254cf597dd/junit-4.13.jar:/root/.gradle/caches/modules-2/files-2.1/org.mockito/mockito-core/3.3.3/4878395d4e63173f3825e17e5e0690e8054445f1/mockito-core-3.3.3.jar:/root/.gradle/caches/modules-2/files-2.1/org.assertj/assertj-core/3.16.1/6e772120aff69ca3d1583b3d1b36b7529de43ba1/assertj-core-3.16.1.jar:/root/.gradle/caches/modules-2/files-2.1/org.springframework/spring-context/5.3.0-SNAPSHOT/d1f9ab47b0ff140a320ca4acafda7b74b2dbec0e/spring-context-5.3.0-SNAPSHOT.jar:/root/.gradle/caches/modules-2/files-2.1/org.springframework/spring-messaging/5.3.0-SNAPSHOT/f777b4db3d6cd54f4a8a8c45d103f7d5bbe0eedc/spring-messaging-5.3.0-SNAPSHOT.jar:/root/.gradle/caches/modules-2/files-2.1/org.springframework/spring-test/5.3.0-SNAPSHOT/80e7ce0dcb393c1aea0675d3f46cf712e4d88647/spring-test-5.3.0-SNAPSHOT.jar:/root/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar:/root/.gradle/caches/modules-2/files-2.1/org.junit.platform/junit-platform-commons/1.7.0-M1/76faa65326b6cc45804661702a5bea17064d6a4c/junit-platform-commons-1.7.0-M1.jar:/root/.gradle/caches/modules-2/files-2.1/org.junit.jupiter/junit-jupiter-api/5.7.0-M1/4e1de96a48382af7c7519fb297ad536b45a58794/junit-jupiter-api-5.7.0-M1.jar:/root/.gradle/caches/modules-2/files-2.1/org.apiguardian/apiguardian-api/1.0.0/3ef5276905e36f4d8055fe3cb0bdcc7503ffc85d/apiguardian-api-1.0.0.jar:/root/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.3/4e857439fc4fe974d212adaaaa3b118b8b50e3ec/log4j-core-2.13.3.jar:/root/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/2.2/3f2bd07716a31c395e2837254f37f21f0f0ab24b/hamcrest-core-2.2.jar:/root/.gradle/caches/modules-2/files-2.1/net.bytebuddy/byte-buddy/1.10.5/d39f2a6c7a3550e03fb12a870e0829b0fa87f036/byte-buddy-1.10.5.jar:/root/.gradle/caches/modules-2/files-2.1/net.bytebuddy/byte-buddy-agent/1.10.5/d1c949ee74c3421ffd3d9159c867777ded928448/byte-buddy-agent-1.10.5.jar:/root/.gradle/caches/modules-2/files-2.1/org.objenesis/objenesis/2.6/639033469776fd37c08358c6b92a4761feb2af4b/objenesis-2.6.jar:/root/.gradle/caches/modules-2/files-2.1/org.springframework/spring-aop/5.3.0-SNAPSHOT/92638df22c2a9cd08417dac9436b8808c6bbe51f/spring-aop-5.3.0-SNAPSHOT.jar:/root/.gradle/caches/modules-2/files-2.1/org.springframework/spring-beans/5.3.0-SNAPSHOT/5f45d6dff21a5b30d27486d3594a1471029dba1c/spring-beans-5.3.0-SNAPSHOT.jar:/root/.gradle/caches/modules-2/files-2.1/org.springframework/spring-expression/5.3.0-SNAPSHOT/8871596af295899a8d57df8d0b4badf86b73423d/spring-expression-5.3.0-SNAPSHOT.jar:/root/.gradle/caches/modules-2/files-2.1/org.springframework/spring-core/5.3.0-SNAPSHOT/f756d402ce2741eb76b482562c66a09c26980372/spring-core-5.3.0-SNAPSHOT.jar:/root/.gradle/caches/modules-2/files-2.1/org.opentest4j/opentest4j/1.2.0/28c11eb91f9b6d8e200631d46e20a7f407f2a046/opentest4j-1.2.0.jar:/root/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.3/ec1508160b93d274b1add34419b897bae84c6ca9/log4j-api-2.13.3.jar:/root/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest/2.2/1820c0968dba3a11a1b30669bb1f01978a91dedc/hamcrest-2.2.jar:/root/.gradle/caches/modules-2/files-2.1/org.springframework/spring-jcl/5.3.0-SNAPSHOT/92d05874d1683bad66566789a8f4e0794b078e19/spring-jcl-5.3.0-SNAPSHOT.jar}.

* Try:
Run with --stacktrace option to get the stack trace. Run with --info or --debug option to get more log output. Run with --scan to get full insights.

* Get more help at https://help.gradle.org

Deprecated Gradle features were used in this build, making it incompatible with Gradle 7.0.
Use '--warning-mode all' to show the individual deprecation warnings.
See https://docs.gradle.org/6.5/userguide/command_line_interface.html#sec:command_line_warnings

BUILD FAILED in 1m 34s
144 actionable tasks: 106 executed, 38 up-to-date

@@ -1029,46 +1029,46 @@ else if (fieldClass == Pattern[].class) {
result = "Regular Expressions";
}
else if (fieldClass == SeverityLevel.class) {
result = "Severity";
result = "SeverityLevel";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems to me all this could be reduced to:

} else if (fieldClass.isEnum()) {
  result = fieldClass.getSimpleName();
}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

@strkkk
Copy link
Member

strkkk commented Jun 28, 2020

@gaurabdg please fix CI issues

@strkkk strkkk merged commit f20630b into checkstyle:master Jun 28, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants