Skip to content

Commit af63809

Browse files
committed
HV-2143 Switch to a rouge highlighter
in preparation for the unified theme + add language wherever missing Signed-off-by: marko-bekhta <marko.prykladna@gmail.com>
1 parent cb9bca2 commit af63809

16 files changed

+239
-227
lines changed

documentation/pom.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@
227227
<stylesdir>css</stylesdir>
228228
<iconfont-remote>false</iconfont-remote>
229229
<iconfont-name>font-awesome/css/font-awesome.min</iconfont-name>
230-
<source-highlighter>prettify</source-highlighter>
230+
<source-highlighter>rouge</source-highlighter>
231231
</attributes>
232232
</configuration>
233233
</execution>
@@ -252,6 +252,7 @@
252252
<engine-sourcedir>${asciidoctor.engine-source-dir}</engine-sourcedir>
253253

254254
<hvVersion>${project.version}</hvVersion>
255+
<hvVersionShort>${parsed-version.org.hibernate.validator.majorVersion}.${parsed-version.org.hibernate.validator.minorVersion}</hvVersionShort>
255256
<bvVersion>${version.jakarta.validation-api}</bvVersion>
256257
<jbossLoggingVersion>${version.org.jboss.logging.jboss-logging}</jbossLoggingVersion>
257258
<classmateVersion>${version.com.fasterxml.classmate}</classmateVersion>
@@ -329,7 +330,7 @@
329330
<pagenums/>
330331
<idprefix/>
331332
<idseparator>-</idseparator>
332-
<source-highlighter>coderay</source-highlighter>
333+
<source-highlighter>rouge</source-highlighter>
333334
</attributes>
334335
</configuration>
335336
</execution>

documentation/src/main/asciidoc/ch01.asciidoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ your __pom.xml__:
1515

1616
.Hibernate Validator Maven dependency
1717
====
18-
[source, XML]
18+
[source, xml]
1919
[subs="verbatim,attributes"]
2020
----
2121
<dependency>
@@ -42,7 +42,7 @@ implementation]:
4242

4343
.Maven dependencies for Unified EL reference implementation
4444
====
45-
[source, XML]
45+
[source, xml]
4646
[subs="verbatim,attributes"]
4747
----
4848
<dependency>
@@ -71,7 +71,7 @@ Validator CDI portable extension by adding the following Maven dependency to you
7171

7272
.Hibernate Validator CDI portable extension Maven dependency
7373
====
74-
[source, XML]
74+
[source, xml]
7575
[subs="verbatim,attributes"]
7676
----
7777
<dependency>
@@ -115,7 +115,7 @@ Let's dive directly into an example to see how to apply constraints.
115115
[[example-class-car]]
116116
.Class Car annotated with constraints
117117
====
118-
[source, JAVA, indent=0]
118+
[source, java, indent=0]
119119
----
120120
include::{sourcedir}/org/hibernate/validator/referenceguide/chapter01/Car.java[]
121121
----
@@ -144,7 +144,7 @@ unit test for `Car`:
144144

145145
.Class CarTest showing validation examples
146146
====
147-
[source, JAVA, indent=0]
147+
[source, java, indent=0]
148148
----
149149
include::{sourcedir}/org/hibernate/validator/referenceguide/chapter01/CarTest.java[]
150150
----

documentation/src/main/asciidoc/ch02.asciidoc

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ level configuration example:
3636
[[example-field-level]]
3737
.Field-level constraints
3838
====
39-
[source, JAVA, indent=0]
39+
[source, java, indent=0]
4040
----
4141
include::{sourcedir}/org/hibernate/validator/referenceguide/chapter02/fieldlevel/Car.java[tags=include]
4242
----
@@ -66,7 +66,7 @@ constraints are used.
6666
[[example-property-level]]
6767
.Property-level constraints
6868
====
69-
[source, JAVA, indent=0]
69+
[source, java, indent=0]
7070
----
7171
include::{sourcedir}/org/hibernate/validator/referenceguide/chapter02/propertylevel/Car.java[tags=include]
7272
----
@@ -129,12 +129,12 @@ element. <<example-container-element-constraints-iterable>> shows an example of
129129
[[example-container-element-constraints-iterable]]
130130
.Container element constraint on `Set`
131131
====
132-
[source, JAVA, indent=0]
132+
[source, java, indent=0]
133133
----
134134
include::{sourcedir}/org/hibernate/validator/referenceguide/chapter02/containerelement/set/Car.java[tags=include]
135135
----
136136
137-
[source, JAVA, indent=0]
137+
[source, java, indent=0]
138138
----
139139
include::{sourcedir}/org/hibernate/validator/referenceguide/chapter02/containerelement/set/CarTest.java[tags=validateSetContainerElementConstraint]
140140
----
@@ -151,12 +151,12 @@ element. <<example-container-element-constraints-list>> shows an example of a
151151
[[example-container-element-constraints-list]]
152152
.Container element constraint on `List`
153153
====
154-
[source, JAVA, indent=0]
154+
[source, java, indent=0]
155155
----
156156
include::{sourcedir}/org/hibernate/validator/referenceguide/chapter02/containerelement/list/Car.java[tags=include]
157157
----
158158
159-
[source, JAVA, indent=0]
159+
[source, java, indent=0]
160160
----
161161
include::{sourcedir}/org/hibernate/validator/referenceguide/chapter02/containerelement/list/CarTest.java[tags=validateListContainerElementConstraint]
162162
----
@@ -173,17 +173,17 @@ and a constraint on the value.
173173
[[example-container-element-constraints-map]]
174174
.Container element constraint on map keys and values
175175
====
176-
[source, JAVA, indent=0]
176+
[source, java, indent=0]
177177
----
178178
include::{sourcedir}/org/hibernate/validator/referenceguide/chapter02/containerelement/map/Car.java[tags=include]
179179
----
180180
181-
[source, JAVA, indent=0]
181+
[source, java, indent=0]
182182
----
183183
include::{sourcedir}/org/hibernate/validator/referenceguide/chapter02/containerelement/map/CarTest.java[tags=validateMapValueContainerElementConstraint]
184184
----
185185
186-
[source, JAVA, indent=0]
186+
[source, java, indent=0]
187187
----
188188
include::{sourcedir}/org/hibernate/validator/referenceguide/chapter02/containerelement/map/CarTest.java[tags=validateMapKeyContainerElementConstraint]
189189
----
@@ -204,12 +204,12 @@ an example of an `Optional` with a container element constraint.
204204
[[example-container-element-constraints-optional]]
205205
.Container element constraint on Optional
206206
====
207-
[source, JAVA, indent=0]
207+
[source, java, indent=0]
208208
----
209209
include::{sourcedir}/org/hibernate/validator/referenceguide/chapter02/containerelement/optional/Car.java[tags=include]
210210
----
211211
212-
[source, JAVA, indent=0]
212+
[source, java, indent=0]
213213
----
214214
include::{sourcedir}/org/hibernate/validator/referenceguide/chapter02/containerelement/optional/CarTest.java[tags=validateOptionalContainerElementConstraint]
215215
----
@@ -232,27 +232,27 @@ parameterized type with a type argument constraint.
232232
[[example-container-element-constraints-custom-container-type]]
233233
.Container element constraint on custom container type
234234
====
235-
[source, JAVA, indent=0]
235+
[source, java, indent=0]
236236
----
237237
include::{sourcedir}/org/hibernate/validator/referenceguide/chapter02/containerelement/custom/Car.java[tags=include]
238238
----
239239
240-
[source, JAVA, indent=0]
240+
[source, java, indent=0]
241241
----
242242
include::{sourcedir}/org/hibernate/validator/referenceguide/chapter02/containerelement/custom/GearBox.java[tags=include]
243243
----
244244
245-
[source, JAVA, indent=0]
245+
[source, java, indent=0]
246246
----
247247
include::{sourcedir}/org/hibernate/validator/referenceguide/chapter02/containerelement/custom/Gear.java[tags=include]
248248
----
249249
250-
[source, JAVA, indent=0]
250+
[source, java, indent=0]
251251
----
252252
include::{sourcedir}/org/hibernate/validator/referenceguide/chapter02/containerelement/custom/GearBoxValueExtractor.java[tags=include]
253253
----
254254
255-
[source, JAVA, indent=0]
255+
[source, java, indent=0]
256256
----
257257
include::{sourcedir}/org/hibernate/validator/referenceguide/chapter02/containerelement/custom/CarTest.java[tags=validateCustomContainerElementConstraint]
258258
----
@@ -268,7 +268,7 @@ constraints on `Part` and `Manufacturer` will be enforced.
268268
[[example-container-element-nested]]
269269
.Constraints on nested container elements
270270
====
271-
[source, JAVA, indent=0]
271+
[source, java, indent=0]
272272
----
273273
include::{sourcedir}/org/hibernate/validator/referenceguide/chapter02/containerelement/nested/Car.java[tags=include]
274274
----
@@ -293,7 +293,7 @@ constraint.
293293
[[example-class-level]]
294294
.Class-level constraint
295295
====
296-
[source, JAVA, indent=0]
296+
[source, java, indent=0]
297297
----
298298
include::{sourcedir}/org/hibernate/validator/referenceguide/chapter02/classlevel/Car.java[tags=include]
299299
----
@@ -308,12 +308,12 @@ things clearer let's have a look at the following example:
308308

309309
.Constraint inheritance
310310
====
311-
[source, JAVA, indent=0]
311+
[source, java, indent=0]
312312
----
313313
include::{sourcedir}/org/hibernate/validator/referenceguide/chapter02/inheritance/Car.java[tags=include]
314314
----
315315
316-
[source, JAVA, indent=0]
316+
[source, java, indent=0]
317317
----
318318
include::{sourcedir}/org/hibernate/validator/referenceguide/chapter02/inheritance/RentalCar.java[tags=include]
319319
----
@@ -339,12 +339,12 @@ reference to another object with `@Valid` as demonstrated in <<example-cascaded-
339339
[[example-cascaded-validation]]
340340
.Cascaded validation
341341
====
342-
[source, JAVA, indent=0]
342+
[source, java, indent=0]
343343
----
344344
include::{sourcedir}/org/hibernate/validator/referenceguide/chapter02/objectgraph/Car.java[tags=include]
345345
----
346346
347-
[source, JAVA, indent=0]
347+
[source, java, indent=0]
348348
----
349349
include::{sourcedir}/org/hibernate/validator/referenceguide/chapter02/objectgraph/Person.java[tags=include]
350350
----
@@ -373,17 +373,17 @@ Cascaded validation is also supported for nested container elements.
373373
[[example-cascaded-validation-list]]
374374
.Cascaded validation of containers
375375
====
376-
[source, JAVA, indent=0]
376+
[source, java, indent=0]
377377
----
378378
include::{sourcedir}/org/hibernate/validator/referenceguide/chapter02/objectgraph/containerelement/Car.java[tags=include]
379379
----
380380
381-
[source, JAVA, indent=0]
381+
[source, java, indent=0]
382382
----
383383
include::{sourcedir}/org/hibernate/validator/referenceguide/chapter02/objectgraph/containerelement/Part.java[tags=include]
384384
----
385385
386-
[source, JAVA, indent=0]
386+
[source, java, indent=0]
387387
----
388388
include::{sourcedir}/org/hibernate/validator/referenceguide/chapter02/objectgraph/containerelement/Manufacturer.java[tags=include]
389389
----
@@ -423,7 +423,7 @@ use the static method `Validation#buildDefaultValidatorFactory()`:
423423

424424
.`Validation#buildDefaultValidatorFactory()`
425425
====
426-
[source, JAVA, indent=0]
426+
[source, java, indent=0]
427427
----
428428
include::{sourcedir}/org/hibernate/validator/referenceguide/chapter02/validation/ValidationTest.java[tags=setUpValidator]
429429
----
@@ -456,7 +456,7 @@ property. The validation call therefore returns one `ConstraintViolation` object
456456
[[example-validator-validate]]
457457
.Using `Validator#validate()`
458458
====
459-
[source, JAVA, indent=0]
459+
[source, java, indent=0]
460460
----
461461
include::{sourcedir}/org/hibernate/validator/referenceguide/chapter02/validation/ValidationTest.java[tags=validate]
462462
----
@@ -470,7 +470,7 @@ property name is the JavaBeans property name.
470470

471471
.Using `Validator#validateProperty()`
472472
====
473-
[source, JAVA, indent=0]
473+
[source, java, indent=0]
474474
----
475475
include::{sourcedir}/org/hibernate/validator/referenceguide/chapter02/validation/ValidationTest.java[tags=validateProperty]
476476
----
@@ -484,7 +484,7 @@ validated successfully, if the property had the specified value:
484484

485485
.Using `Validator#validateValue()`
486486
====
487-
[source, JAVA, indent=0]
487+
[source, java, indent=0]
488488
----
489489
include::{sourcedir}/org/hibernate/validator/referenceguide/chapter02/validation/ValidationTest.java[tags=validateValue]
490490
----

0 commit comments

Comments
 (0)