Skip to content

Commit a960a1c

Browse files
ganatanganatan
committed
Improve checkstyle on backend-springboot
1 parent 98270e0 commit a960a1c

File tree

16 files changed

+155
-42
lines changed

16 files changed

+155
-42
lines changed

‎backend-java/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868

6969
<build>
7070
<plugins>
71+
7172
<plugin>
7273
<groupId>org.apache.maven.plugins</groupId>
7374
<artifactId>maven-compiler-plugin</artifactId>

‎backend-javascript/.env.development‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,20 @@ DB_MYSQL_USER=root
3939
DB_MYSQL_PASSWORD=Trustno1
4040

4141
# === ELASTICSEARCH ===
42-
LOGSTASH_ENABLED=false
43-
ELASTIC_ENABLED=false
42+
ELASTIC_ENABLED=true
4443
ELASTICSEARCH_NODE=http://localhost:9200
44+
ELASTIC_INDEX_PREFIX=backend-javascript-logs
45+
46+
# === LOGSTASH ===
47+
LOGSTASH_ENABLED=false
4548

4649
# === REDIS ===
4750
REDIS_ENABLED=false
4851
REDIS_REQUIRED=false
4952
REDIS_URL=redis://localhost:6379
5053

5154
# === PROMETHEUS ===
52-
PROMETHEUS_ENABLED=true
55+
PROMETHEUS_ENABLED=false
5356
# PROMETHEUS_MODE=http_requests_total
5457
PROMETHEUS_MODE=all
5558

‎backend-javascript/.env.production‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,12 @@ DB_MYSQL_USER=root
3939
DB_MYSQL_PASSWORD=Trustno1
4040

4141
# === ELASTICSEARCH ===
42-
LOGSTASH_ENABLED=false
4342
ELASTIC_ENABLED=false
4443
ELASTICSEARCH_NODE=http://localhost:9200
44+
ELASTIC_INDEX_PREFIX=backend-javascript-logs
45+
46+
# === LOGSTASH ===
47+
LOGSTASH_ENABLED=false
4548

4649
# === REDIS ===
4750
REDIS_ENABLED=false

‎backend-javascript/.env.test‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,12 @@ DB_MYSQL_USER=root
3838
DB_MYSQL_PASSWORD=Trustno1
3939

4040
# === ELASTICSEARCH ===
41-
LOGSTASH_ENABLED=false
4241
ELASTIC_ENABLED=false
4342
ELASTICSEARCH_NODE=http://localhost:9200
43+
ELASTIC_INDEX_PREFIX=backend-javascript-logs
44+
45+
# === LOGSTASH ===
46+
LOGSTASH_ENABLED=false
4447

4548
# === REDIS ===
4649
REDIS_ENABLED=false

‎backend-javascript/docker/docker-compose.k6.yml‎

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

‎backend-javascript/docker/docker-compose.monitoring.yml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,6 @@ services:
2727
ports:
2828
- "5044:5044"
2929

30-
prometheus:
31-
image: prom/prometheus
32-
container_name: prometheus
33-
volumes:
34-
- prometheus_data:/prometheus
35-
- ./prometheus.yml:/etc/prometheus/prometheus.yml
36-
ports:
37-
- "9090:9090"
38-
3930
grafana:
4031
image: grafana/grafana
4132
container_name: grafana
@@ -53,6 +44,3 @@ services:
5344
container_name: redisinsight
5445
ports:
5546
- "8001:8001"
56-
57-
volumes:
58-
prometheus_data:

‎backend-javascript/docker/prometheus.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
global:
2-
scrape_interval: 25s
2+
scrape_interval: 60s
33

44
scrape_configs:
55
- job_name: 'backend-javascript'

‎backend-javascript/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
"docker:remove-all-containers": "FOR /f %i IN ('docker ps -a -q') DO docker rm -f %i",
3636
"docker:remove-all-images": "FOR /f %i IN ('docker images -q') DO docker rmi -f %i",
3737
"docker:remove-all-volumes": "FOR /f %i IN ('docker volume ls -q') DO docker volume rm %i",
38+
"docker:remove-all": "npm run docker:remove-all-containers && npm run docker:remove-all-images && npm run docker:remove-all-volumes",
3839
"docker:list-containers": "docker ps -a",
3940
"docker:list-images": "docker images",
4041
"docker:list-volumes": "docker volume ls",

‎backend-javascript/src/infrastructure/logger/logger.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ import { createLogger, transports, format } from 'winston';
22
import DailyRotateFile from 'winston-daily-rotate-file';
33
import { ElasticsearchTransport } from 'winston-elasticsearch';
44

5+
const ELASTIC_INDEX_PREFIX = process.env.ELASTIC_INDEX_PREFIX || 'backend-javascript-logs';
6+
57
const transportsArray = [];
68

79
if (process.env.LOGSTASH_ENABLED === 'true') {
@@ -18,7 +20,7 @@ if (process.env.LOGSTASH_ENABLED === 'true') {
1820
} else if (process.env.ELASTIC_ENABLED === 'true') {
1921
const esTransport = new ElasticsearchTransport({
2022
level: 'info',
21-
indexPrefix: 'backend-javascript-logs',
23+
indexPrefix: ELASTIC_INDEX_PREFIX,
2224
clientOpts: {
2325
node: process.env.ELASTICSEARCH_NODE || 'http://localhost:9200',
2426
},

‎backend-springboot/checkstyle.xml‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
<?xml version="1.0"?>
2+
<!DOCTYPE module PUBLIC
3+
"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
4+
"https://checkstyle.org/dtds/configuration_1_3.dtd">
5+
6+
<module name="Checker">
7+
8+
<!-- Propriétés globales -->
9+
<property name="charset" value="UTF-8"/>
10+
<property name="severity" value="warning"/>
11+
12+
<!-- Longueur des lignes -->
13+
<!-- <module name="LineLength">
14+
<property name="max" value="120"/>
15+
</module>
16+
-->
17+
<!-- Espaces inutiles -->
18+
<!-- <module name="RegexpSingleline">
19+
<property name="format" value="\s+$"/>
20+
<property name="minimum" value="0"/>
21+
<property name="maximum" value="0"/>
22+
<property name="message" value="Trailing whitespace"/>
23+
</module>
24+
-->
25+
<!-- TreeWalker pour les règles Java -->
26+
<module name="TreeWalker">
27+
28+
<!-- IMPORTS -->
29+
<!-- <module name="AvoidStarImport"/>
30+
<module name="UnusedImports"/>
31+
<module name="ImportOrder">
32+
<property name="groups" value="java,javax,jakarta,org,com"/>
33+
<property name="ordered" value="true"/>
34+
<property name="separated" value="true"/>
35+
</module>
36+
-->
37+
<!-- NAMING -->
38+
<module name="TypeName"/>
39+
<module name="MethodName"/>
40+
<module name="ParameterName"/>
41+
<module name="LocalVariableName"/>
42+
<module name="PackageName">
43+
<property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
44+
</module>
45+
46+
<!-- WHITESPACE -->
47+
<module name="EmptyForIteratorPad"/>
48+
<module name="GenericWhitespace"/>
49+
<module name="MethodParamPad"/>
50+
<module name="NoWhitespaceAfter"/>
51+
<module name="NoWhitespaceBefore"/>
52+
<module name="ParenPad"/>
53+
<module name="TypecastParenPad"/>
54+
<module name="WhitespaceAfter"/>
55+
<module name="WhitespaceAround"/>
56+
57+
<!-- MODIFIERS -->
58+
<module name="ModifierOrder"/>
59+
<module name="RedundantModifier"/>
60+
61+
<!-- BLOCKS -->
62+
<module name="EmptyBlock"/>
63+
<module name="LeftCurly"/>
64+
<module name="NeedBraces"/>
65+
<module name="RightCurly"/>
66+
67+
<!-- CODING -->
68+
<module name="EmptyStatement"/>
69+
<module name="EqualsHashCode"/>
70+
<module name="IllegalInstantiation"/>
71+
<module name="SimplifyBooleanExpression"/>
72+
<module name="SimplifyBooleanReturn"/>
73+
74+
<!-- DESIGN -->
75+
<!-- <module name="FinalClass"/>
76+
<module name="HideUtilityClassConstructor"/>
77+
<module name="InterfaceIsType"/>
78+
<module name="VisibilityModifier">
79+
<property name="protectedAllowed" value="true"/>
80+
</module>
81+
-->
82+
<!-- MISCELLANEOUS -->
83+
<module name="ArrayTypeStyle"/>
84+
<module name="UpperEll"/>
85+
86+
</module>
87+
88+
</module>

0 commit comments

Comments
 (0)