Skip to content

Commit a980d8d

Browse files
authored
Migrate from Checkstyle to Spotless (#135)
* Migrate from Checkstyle to Spotless * fix * order
1 parent 981cde6 commit a980d8d

File tree

70 files changed

+1100
-1553
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+1100
-1553
lines changed

.checkstyle/checkstyle.xml

Lines changed: 0 additions & 377 deletions
This file was deleted.

.github/workflows/pull_request.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ jobs:
3737
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
3838
restore-keys: ${{ runner.os }}-m2
3939

40-
- name: Check style
41-
run: mvn checkstyle:check
40+
- name: Lint
41+
run: mvn spotless:check
4242

4343
- name: Build
4444
run: mvn clean package -P production

.github/workflows/push_master.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ jobs:
3636
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
3737
restore-keys: ${{ runner.os }}-m2
3838

39-
- name: Check style
40-
run: mvn checkstyle:check
39+
- name: Lint
40+
run: mvn spotless:check
4141

4242
- name: Build
4343
run: mvn clean package -P production
File renamed without changes.

CODE_OF_CONDUCT.md

Lines changed: 132 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,137 @@
1-
# Code of Conduct
1+
# Contributor Covenant Code of Conduct
22

3-
We want our project to be a welcoming and inclusive community for everyone. This code of conduct outlines our expectations for all contributors, as well as the consequences for unacceptable behavior.
3+
## Our Pledge
4+
5+
We as members, contributors, and leaders pledge to make participation in our
6+
community a harassment-free experience for everyone, regardless of age, body
7+
size, visible or invisible disability, ethnicity, sex characteristics, gender
8+
identity and expression, level of experience, education, socio-economic status,
9+
nationality, personal appearance, race, caste, color, religion, or sexual
10+
identity and orientation.
11+
12+
We pledge to act and interact in ways that contribute to an open, welcoming,
13+
diverse, inclusive, and healthy community.
414

515
## Our Standards
616

7-
We expect all contributors to:
17+
Examples of behavior that contributes to a positive environment for our
18+
community include:
19+
20+
* Demonstrating empathy and kindness toward other people
21+
* Being respectful of differing opinions, viewpoints, and experiences
22+
* Giving and gracefully accepting constructive feedback
23+
* Accepting responsibility and apologizing to those affected by our mistakes,
24+
and learning from the experience
25+
* Focusing on what is best not just for us as individuals, but for the overall
26+
community
27+
28+
Examples of unacceptable behavior include:
29+
30+
* The use of sexualized language or imagery, and sexual attention or advances of
31+
any kind
32+
* Trolling, insulting or derogatory comments, and personal or political attacks
33+
* Public or private harassment
34+
* Publishing others' private information, such as a physical or email address,
35+
without their explicit permission
36+
* Other conduct which could reasonably be considered inappropriate in a
37+
professional setting
38+
39+
## Enforcement Responsibilities
40+
41+
Community leaders are responsible for clarifying and enforcing our standards of
42+
acceptable behavior and will take appropriate and fair corrective action in
43+
response to any behavior that they deem inappropriate, threatening, offensive,
44+
or harmful.
45+
46+
Community leaders have the right and responsibility to remove, edit, or reject
47+
comments, commits, code, wiki edits, issues, and other contributions that are
48+
not aligned to this Code of Conduct, and will communicate reasons for moderation
49+
decisions when appropriate.
50+
51+
## Scope
52+
53+
This Code of Conduct applies within all community spaces, and also applies when
54+
an individual is officially representing the community in public spaces.
55+
Examples of representing our community include using an official email address,
56+
posting via an official social media account, or acting as an appointed
57+
representative at an online or offline event.
58+
59+
## Enforcement
60+
61+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
62+
reported to the community leaders responsible for enforcement at
63+
the contact form available at
64+
[https://opensource.michelin.io](https://opensource.michelin.io)
65+
All complaints will be reviewed and investigated promptly and fairly.
66+
67+
All community leaders are obligated to respect the privacy and security of the
68+
reporter of any incident.
69+
70+
## Enforcement Guidelines
71+
72+
Community leaders will follow these Community Impact Guidelines in determining
73+
the consequences for any action they deem in violation of this Code of Conduct:
74+
75+
### 1. Correction
76+
77+
**Community Impact**: Use of inappropriate language or other behavior deemed
78+
unprofessional or unwelcome in the community.
79+
80+
**Consequence**: A private, written warning from community leaders, providing
81+
clarity around the nature of the violation and an explanation of why the
82+
behavior was inappropriate. A public apology may be requested.
83+
84+
### 2. Warning
85+
86+
**Community Impact**: A violation through a single incident or series of
87+
actions.
88+
89+
**Consequence**: A warning with consequences for continued behavior. No
90+
interaction with the people involved, including unsolicited interaction with
91+
those enforcing the Code of Conduct, for a specified period of time. This
92+
includes avoiding interactions in community spaces as well as external channels
93+
like social media. Violating these terms may lead to a temporary or permanent
94+
ban.
95+
96+
### 3. Temporary Ban
97+
98+
**Community Impact**: A serious violation of community standards, including
99+
sustained inappropriate behavior.
100+
101+
**Consequence**: A temporary ban from any sort of interaction or public
102+
communication with the community for a specified period of time. No public or
103+
private interaction with the people involved, including unsolicited interaction
104+
with those enforcing the Code of Conduct, is allowed during this period.
105+
Violating these terms may lead to a permanent ban.
106+
107+
### 4. Permanent Ban
108+
109+
**Community Impact**: Demonstrating a pattern of violation of community
110+
standards, including sustained inappropriate behavior, harassment of an
111+
individual, or aggression toward or disparagement of classes of individuals.
112+
113+
**Consequence**: A permanent ban from any sort of public interaction within the
114+
community.
115+
116+
## Attribution
117+
118+
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
119+
version 2.1, available at
120+
[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
121+
122+
Community Impact Guidelines were inspired by
123+
[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
124+
125+
For answers to common questions about this code of conduct, see the FAQ at
126+
[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
127+
[https://www.contributor-covenant.org/translations][translations].
128+
129+
[homepage]: https://www.contributor-covenant.org
130+
131+
[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
132+
133+
[Mozilla CoC]: https://github.com/mozilla/diversity
134+
135+
[FAQ]: https://www.contributor-covenant.org/faq
8136

9-
- Be respectful and considerate towards others, regardless of their background, identity, or opinions.
10-
- Refrain from any form of harassment, discrimination, or hate speech.
11-
- Maintain a professional and respectful demeanor in all interactions within the project, including online and in person.
12-
- Be open to constructive feedback and willing to learn from others.
13-
- Respect the privacy of other contributors and users of the project.
137+
[translations]: https://www.contributor-covenant.org/translations

CONTRIBUTING.md

Lines changed: 26 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,59 @@
11
# Contributing to Suricate Widget Tester
22

3-
Welcome to our contribution guide! We're thrilled that you're interested in contributing to our project. This guide will help you understand the process and expectations for contributing, so that we can work together effectively and efficiently.
3+
Welcome to our contribution guide.
4+
This guide will help you understand the process and expectations for contributing.
45

56
## Getting Started
67

78
### Issues
89

9-
Issues should be used to report problems, request a new feature, or to discuss potential changes before a PR is created. When you create a new Issue, a template will be loaded that will guide you through collecting and providing the information we need to investigate.
10+
If you want to report a bug, request a feature, or suggest an improvement, please open an issue on the [GitHub repository](https://github.com/michelin/suricate-widget-tester/issues)
11+
and fill out the appropriate template.
1012

11-
If you find an existing issue that addresses the problem you're having, please add your own reproduction information to the existing issue instead of creating a new one. Adding a [reaction](https://github.blog/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/) can also indicate to our maintainers that a particular problem is affecting more than just the reporter.
13+
If you find an existing issue that matches your problem, please:
14+
- Add your reproduction details to the existing issue instead of creating a duplicate.
15+
- Use reactions (e.g., 👍) on the issue to signal that it affects more users. [GitHub reactions](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) help maintainers prioritize issues based on user impact.
1216

13-
If you're unable to find an open issue addressing the problem, open a new one. Be sure to include a title and a clear description, relevant information, and a code sample or executable test case demonstrating the expected behavior that is not occurring.
17+
If no open issue addresses your problem, please open a new one and include:
18+
- A clear title and detailed description of the issue.
19+
- Relevant environment details (e.g., version, OS, configurations).
20+
- A code sample or executable test case demonstrating the expected behavior that is not occurring.
1421

1522
### Pull Requests
1623

17-
PRs are always welcome and can be a quick way to get your fix or improvement slated for the next release. In general, PRs should:
18-
19-
- Only fix/add the functionality in question OR address wide-spread style issues, not both.
20-
- Add unit or integration tests for fixed or changed functionality (if a test suite already exists).
21-
- Address a single concern in the least number of changed lines as possible.
22-
- Be accompanied by a complete Pull Request template (loaded automatically when a PR is created).
23-
24-
Be sure to use the past tense ("Added new feature...", "Fixed bug on...") and add tags to the PR ("documentation" for documentation updates, "bug" for bug fixing, etc.).
25-
26-
For changes that address core functionality or would require breaking changes (e.g. a major release), it's best to open an Issue to discuss your proposal first. This is not required but can save time creating and reviewing changes.
27-
28-
In general, we follow the ["fork-and-pull" Git workflow](https://github.com/susam/gitpr)
24+
To contribute to Suricate Widget Tester:
2925

3026
- Fork the repository to your own GitHub account
3127
- Clone the project to your machine
32-
- Create a branch locally from master with a succinct but descriptive name
33-
- Commit changes to the branch
34-
- Following any formatting and testing guidelines specific to this repo
35-
- Push changes to your fork
36-
- Open a PR in our repository targeting master and follow the PR template so that we can efficiently review the changes.
28+
- Create a branch from the `master` branch
29+
- Make your changes and commit them to your branch
30+
- FPush your changes to your fork
31+
- Open a merge request to the `master` branch of the Suricate Widget Tester repository so that we can review your changes
3732

3833
## Style Guide
3934

4035
### Back-End
4136

42-
We maintain a consistent code style using [Checkstyle](https://checkstyle.sourceforge.io/).
37+
We maintain a consistent code style using [Spotless](https://github.com/diffplug/spotless/tree/main/plugin-maven).
38+
For Java code, we follow the [Palantir](https://github.com/palantir/palantir-java-format) style.
4339

44-
The configuration file is defined in the `.checkstyle` folder.
45-
To perform Checkstyle validation, run the following:
40+
To check for formatting issues, run:
4641

4742
```bash
48-
mvn checkstyle:check
43+
mvn spotless:check
4944
```
5045

51-
Before you start contributing new code, it is recommended to:
46+
To automatically fix formatting issues and add missing file headers, run:
5247

53-
- Install the IntelliJ [CheckStyle-IDEA](https://plugins.jetbrains.com/plugin/1065-checkstyle-idea) plugin.
54-
- Configure the plugin to use Suricate Widget Tester's Checkstyle configuration file.
48+
```bash
49+
mvn spotless:apply
50+
```
5551

5652
### Front-End
5753

5854
We maintain a consistent code style using [ESLint](https://eslint.org) and [Prettier](https://prettier.io).
5955

60-
We use [Husky](https://typicode.github.io/husky/) and [Lint-Staged](https://github.com/lint-staged/lint-staged) to perform linting and formatting checks before committing.
56+
We use [Husky](https://typicode.github.io/husky/) and [Lint-Staged](https://github.com/lint-staged/lint-staged) to
57+
perform linting and formatting checks before committing.
6158

6259
After the first `npm install`, everything should be set up automatically.

0 commit comments

Comments
 (0)