Skip to content

Commit 6c7fc68

Browse files
AB-xdevAB-xdev
committed
Merge remote-tracking branch 'origin/update-from-template' into develop
2 parents de051ee + c10c778 commit 6c7fc68

File tree

12 files changed

+268
-326
lines changed

12 files changed

+268
-326
lines changed

‎.config/checkstyle/checkstyle.xml

Lines changed: 137 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,137 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
3+
"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
4+
<module name="Checker">
5+
<!-- Only check code -->
6+
<property name="fileExtensions" value="java"/>
7+
<property name="severity" value="error"/>
8+
9+
<property name="tabWidth" value="4"/>
10+
11+
<module name="SuppressionFilter">
12+
<property name="file" value=".config/checkstyle/suppressions.xml"/>
13+
</module>
14+
15+
<module name="FileLength"/>
16+
<module name="LineLength">
17+
<property name="max" value="120"/>
18+
<property name="fileExtensions" value="java"/>
19+
<!-- Ignore default + links in comments -->
20+
<property name="ignorePattern" value="(^(package|import))|(^\s*(\/\/|\*) .*https?.*$)"/>
21+
</module>
22+
<module name="NewlineAtEndOfFile"/>
23+
24+
<module name="RegexpSingleline">
25+
<!-- Ignore inside block comments (*) -->
26+
<property name="format" value="[^\s\*][\s]{1,}$"/>
27+
<property name="minimum" value="0"/>
28+
<property name="maximum" value="0"/>
29+
<property name="message" value="Line has trailing whitespaces"/>
30+
</module>
31+
32+
<!-- Generated code -->
33+
<module name="SuppressionSingleFilter">
34+
<property name="checks" value="."/>
35+
<property name="files" value="[\\/](src)?gen[\\/].*\.java$"/>
36+
</module>
37+
<!-- Test code -->
38+
<module name="SuppressionSingleFilter">
39+
<property name="checks" value="MagicNumberCheck"/>
40+
<property name="files" value="[\\/]test[\\/].*\.java$"/>
41+
</module>
42+
<module name="SuppressWarningsFilter"/>
43+
44+
<module name="TreeWalker">
45+
<!-- Checks - sorted alphabetically -->
46+
<module name="ArrayTypeStyle"/>
47+
<module name="AvoidStarImport"/>
48+
<module name="ConstantName"/>
49+
<module name="DefaultComesLast"/>
50+
<module name="EmptyBlock"/>
51+
<module name="EmptyCatchBlock"/>
52+
<module name="EmptyForInitializerPad"/>
53+
<module name="EmptyForIteratorPad"/>
54+
<module name="EmptyStatement"/>
55+
<module name="EqualsHashCode"/>
56+
<module name="ExplicitInitialization">
57+
<property name="severity" value="info"/>
58+
</module>
59+
<module name="FinalClass"/>
60+
<module name="FinalParameters"/>
61+
<module name="GenericWhitespace"/>
62+
<module name="HideUtilityClassConstructor"/>
63+
<module name="IllegalImport"/>
64+
<module name="InterfaceIsType"/>
65+
<module name="JavadocStyle">
66+
<property name="checkFirstSentence" value="false"/>
67+
</module>
68+
<module name="LeftCurly">
69+
<!-- Default minus Lambda -->
70+
<property name="tokens" value="ANNOTATION_DEF, CLASS_DEF, CTOR_DEF, ENUM_CONSTANT_DEF, ENUM_DEF, INTERFACE_DEF, LITERAL_CASE, LITERAL_CATCH, LITERAL_DEFAULT, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, METHOD_DEF, OBJBLOCK, STATIC_INIT, RECORD_DEF, COMPACT_CTOR_DEF"/>
71+
<property name="option" value="nl"/>
72+
</module>
73+
<module name="LocalFinalVariableName"/>
74+
<module name="LocalVariableName"/>
75+
<module name="MagicNumber">
76+
<property name="ignoreAnnotation" value="true"/>
77+
<property name="ignoreFieldDeclaration" value="true"/>
78+
<property name="ignoreHashCodeMethod" value="true"/>
79+
<!-- Defaults + other common constant values (e.g. time) -->
80+
<property name="ignoreNumbers" value="-1, 0, 1, 2, 3, 4, 5, 10, 12, 24, 31, 60, 100, 1000"/>
81+
</module>
82+
<module name="MemberName"/>
83+
<module name="MethodLength"/>
84+
<module name="MethodName"/>
85+
<module name="MethodParamPad"/>
86+
<module name="MissingDeprecated"/>
87+
<module name="MissingOverride"/>
88+
<module name="MissingSwitchDefault"/>
89+
<module name="ModifierOrder"/>
90+
<module name="NeedBraces"/>
91+
<module name="NoClone"/>
92+
<module name="NoFinalizer"/>
93+
<module name="NonEmptyAtclauseDescription"/>
94+
<module name="NoWhitespaceAfter"/>
95+
<module name="NoWhitespaceBefore"/>
96+
<module name="OneStatementPerLine"/>
97+
<module name="OneTopLevelClass"/>
98+
<module name="OperatorWrap"/>
99+
<module name="OuterTypeNumber"/>
100+
<module name="PackageName"/>
101+
<module name="ParameterName"/>
102+
<module name="ParenPad"/>
103+
<module name="RedundantImport"/>
104+
<module name="RequireThis"/>
105+
<module name="RightCurly">
106+
<property name="option" value="alone"/>
107+
</module>
108+
<module name="SimplifyBooleanExpression"/>
109+
<module name="StaticVariableName"/>
110+
<module name="StringLiteralEquality"/>
111+
<module name="SuppressWarningsHolder"/>
112+
<module name="TodoComment">
113+
<property name="severity" value="info"/>
114+
</module>
115+
<module name="TypecastParenPad"/>
116+
<module name="TypeName"/>
117+
<module name="UnusedImports"/>
118+
<module name="UpperEll"/>
119+
<module name="VisibilityModifier">
120+
<property name="packageAllowed" value="true"/>
121+
<property name="protectedAllowed" value="true"/>
122+
</module>
123+
<module name="WhitespaceAfter">
124+
<property name="tokens" value="COMMA,SEMI"/>
125+
</module>
126+
<module name="WhitespaceAround">
127+
<property name="tokens"
128+
value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,COLON,DIV,DIV_ASSIGN,EQUAL,GE,GT,LAND,LCURLY,LE,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,QUESTION,RCURLY,SL,SLIST,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN,TYPE_EXTENSION_AND"/>
129+
</module>
130+
131+
<!-- Filter -->
132+
<module name="SuppressionCommentFilter">
133+
<property name="offCommentFormat" value="\s*CHECKSTYLE:OFF\s*[^\s]{1,}"/>
134+
<property name="onCommentFormat" value="\s*CHECKSTYLE:ON"/>
135+
</module>
136+
</module>
137+
</module>

‎.config/checkstyle/suppressions.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0"?>
2+
<!DOCTYPE suppressions PUBLIC
3+
"-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
4+
"https://checkstyle.org/dtds/suppressions_1_2.dtd">
5+
<suppressions>
6+
</suppressions>

‎.github/workflows/checkBuild.yml

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,16 @@ on:
66
branches: [ develop ]
77
paths-ignore:
88
- '**.md'
9+
- '.config/**'
10+
- '.idea/**'
11+
- 'assets/**'
912
pull_request:
1013
branches: [ develop ]
1114
paths-ignore:
1215
- '**.md'
16+
- '.config/**'
17+
- '.idea/**'
18+
- 'assets/**'
1319

1420
env:
1521
PRIMARY_MAVEN_MODULE: ${{ github.event.repository.name }}
@@ -28,7 +34,7 @@ jobs:
2834
- uses: actions/checkout@v4
2935

3036
- name: Set up JDK
31-
uses: actions/setup-java@v3
37+
uses: actions/setup-java@v4
3238
with:
3339
distribution: ${{ matrix.distribution }}
3440
java-version: ${{ matrix.java }}
@@ -56,7 +62,7 @@ jobs:
5662
fi
5763
5864
- name: Upload demo files
59-
uses: actions/upload-artifact@v3
65+
uses: actions/upload-artifact@v4
6066
with:
6167
name: demo-files-java-${{ matrix.java }}
6268
path: ${{ env.DEMO_MAVEN_MODULE }}/target/${{ env.DEMO_MAVEN_MODULE }}.jar
@@ -69,3 +75,24 @@ jobs:
6975
name: test-fail-screenshots-${{ matrix.java }}
7076
path: ${{ env.PRIMARY_MAVEN_MODULE }}/target/screenshots
7177
if-no-files-found: ignore
78+
79+
code-style:
80+
runs-on: ubuntu-latest
81+
82+
strategy:
83+
matrix:
84+
java: [17]
85+
distribution: [temurin]
86+
87+
steps:
88+
- uses: actions/checkout@v4
89+
90+
- name: Set up JDK
91+
uses: actions/setup-java@v4
92+
with:
93+
distribution: ${{ matrix.distribution }}
94+
java-version: ${{ matrix.java }}
95+
cache: 'maven'
96+
97+
- name: Run Checkstyle
98+
run: mvn -B checkstyle:check -P checkstyle -T2C

‎.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- uses: actions/checkout@v4
2020

2121
- name: Set up JDK
22-
uses: actions/setup-java@v3
22+
uses: actions/setup-java@v4
2323
with:
2424
java-version: '17'
2525
distribution: 'temurin'
@@ -120,7 +120,7 @@ jobs:
120120
git pull
121121
122122
- name: Set up JDK Apache Maven Central
123-
uses: actions/setup-java@v3
123+
uses: actions/setup-java@v4
124124
with: # running setup-java again overwrites the settings.xml
125125
java-version: '17'
126126
distribution: 'temurin'
@@ -152,7 +152,7 @@ jobs:
152152
git pull
153153
154154
- name: Setup - Java
155-
uses: actions/setup-java@v3
155+
uses: actions/setup-java@v4
156156
with:
157157
java-version: '17'
158158
distribution: 'temurin'
@@ -163,7 +163,7 @@ jobs:
163163
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
164164

165165
- name: Upload licenses - Upload Artifact
166-
uses: actions/upload-artifact@v3
166+
uses: actions/upload-artifact@v4
167167
with:
168168
name: dependencies-licenses
169169
path: ${{ env.PRIMARY_MAVEN_MODULE }}/target/site

‎.github/workflows/sonar.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,16 @@ on:
66
branches: [ develop ]
77
paths-ignore:
88
- '**.md'
9+
- '.config/**'
10+
- '.idea/**'
911
- 'assets/**'
10-
- 'config/**'
1112
pull_request:
1213
types: [opened, synchronize, reopened]
1314
paths-ignore:
1415
- '**.md'
16+
- '.config/**'
17+
- '.idea/**'
1518
- 'assets/**'
16-
- 'config/**'
1719

1820
env:
1921
SONARCLOUD_ORG: ${{ github.event.organization.login }}
@@ -31,7 +33,7 @@ jobs:
3133
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
3234

3335
- name: Set up JDK
34-
uses: actions/setup-java@v3
36+
uses: actions/setup-java@v4
3537
with:
3638
distribution: 'temurin'
3739
java-version: 17

‎.github/workflows/test-deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- uses: actions/checkout@v4
1414

1515
- name: Set up JDK OSSRH
16-
uses: actions/setup-java@v3
16+
uses: actions/setup-java@v4
1717
with: # running setup-java again overwrites the settings.xml
1818
distribution: 'temurin'
1919
java-version: '17'

‎.idea/checkstyle-idea.xml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/codeStyles/Project.xml

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎chartjs-java-model-demo/pom.xml

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<plugin>
4242
<groupId>org.apache.maven.plugins</groupId>
4343
<artifactId>maven-compiler-plugin</artifactId>
44-
<version>3.11.0</version>
44+
<version>3.12.1</version>
4545
<configuration>
4646
<release>${maven.compiler.release}</release>
4747
<compilerArgs>
@@ -79,4 +79,35 @@
7979
</plugin>
8080
</plugins>
8181
</build>
82+
<profiles>
83+
<profile>
84+
<id>checkstyle</id>
85+
<build>
86+
<plugins>
87+
<plugin>
88+
<groupId>org.apache.maven.plugins</groupId>
89+
<artifactId>maven-checkstyle-plugin</artifactId>
90+
<version>3.3.1</version>
91+
<dependencies>
92+
<dependency>
93+
<groupId>com.puppycrawl.tools</groupId>
94+
<artifactId>checkstyle</artifactId>
95+
<version>10.12.7</version>
96+
</dependency>
97+
</dependencies>
98+
<configuration>
99+
<configLocation>../.config/checkstyle/checkstyle.xml</configLocation>
100+
</configuration>
101+
<executions>
102+
<execution>
103+
<goals>
104+
<goal>check</goal>
105+
</goals>
106+
</execution>
107+
</executions>
108+
</plugin>
109+
</plugins>
110+
</build>
111+
</profile>
112+
</profiles>
82113
</project>

0 commit comments

Comments
 (0)