-
Notifications
You must be signed in to change notification settings - Fork 7
/
Copy pathec,l
694 lines (694 loc) · 42.3 KB
/
ec,l
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
[1mdiff --git a/architecture/persistence-context.html b/architecture/persistence-context.html[m
[1mindex 52f025b4..699b4d9b 100644[m
[1m--- a/architecture/persistence-context.html[m
[1m+++ b/architecture/persistence-context.html[m
[36m@@ -248,7 +248,7 @@[m
<p>[m
A more realistic example would be when the persistence context is used:[m
</p>[m
[31m- <div class="syntax java"><div class="highlight"><pre><span></span><span class="c1">// a new persistence context started with the transaction</span>[m
[32m+[m[32m <div class="syntax java"><div class="highlight"><pre><span></span><span class="c1">// a new persistence context started with the transaction</span>[m
<span class="n">Ebean</span><span class="o">.</span><span class="na">beginTransaction</span><span class="o">();</span>[m
[m
<span class="k">try</span> <span class="o">{</span>[m
[1mdiff --git a/docs/architecture/persistence-context.html b/docs/architecture/persistence-context.html[m
[1mindex 52f025b4..699b4d9b 100644[m
[1m--- a/docs/architecture/persistence-context.html[m
[1m+++ b/docs/architecture/persistence-context.html[m
[36m@@ -248,7 +248,7 @@[m
<p>[m
A more realistic example would be when the persistence context is used:[m
</p>[m
[31m- <div class="syntax java"><div class="highlight"><pre><span></span><span class="c1">// a new persistence context started with the transaction</span>[m
[32m+[m[32m <div class="syntax java"><div class="highlight"><pre><span></span><span class="c1">// a new persistence context started with the transaction</span>[m
<span class="n">Ebean</span><span class="o">.</span><span class="na">beginTransaction</span><span class="o">();</span>[m
[m
<span class="k">try</span> <span class="o">{</span>[m
[1mdiff --git a/docs/enhancement/index.html b/docs/enhancement/index.html[m
[1mindex e8cb7e66..c8389b04 100644[m
[1m--- a/docs/enhancement/index.html[m
[1m+++ b/docs/enhancement/index.html[m
[36m@@ -232,20 +232,20 @@[m
[m
[m
<h5>ebean enhancement tile</h5>[m
[31m-<div class="syntax xml"><div class="highlight"><pre><span></span><span class="nt"><plugin></span>[m
[31m- <span class="nt"><groupId></span>io.repaint.maven<span class="nt"></groupId></span>[m
[31m- <span class="nt"><artifactId></span>tiles-maven-plugin<span class="nt"></artifactId></span>[m
[31m- <span class="nt"><version></span>2.18<span class="nt"></version></span>[m
[31m- <span class="nt"><extensions></span>true<span class="nt"></extensions></span>[m
[31m- <span class="nt"><configuration></span>[m
[31m- <span class="nt"><tiles></span>[m
[31m- <span class="c"><!-- other tiles ... --></span>[m
[31m- <span class="nt"><tile></span>io.ebean.tile:enhancement:12.12.1<span class="nt"></tile></span>[m
[31m- <span class="nt"></tiles></span>[m
[31m- <span class="nt"></configuration></span>[m
[31m-<span class="nt"></plugin></span>[m
[31m-</pre></div>[m
[31m-</div>[m
[32m+[m[32m```xml[m
[32m+[m[32m<plugin>[m
[32m+[m[32m <groupId>io.repaint.maven</groupId>[m
[32m+[m[32m <artifactId>tiles-maven-plugin</artifactId>[m
[32m+[m[32m <version>2.18</version>[m
[32m+[m[32m <extensions>true</extensions>[m
[32m+[m[32m <configuration>[m
[32m+[m[32m <tiles>[m
[32m+[m[32m <!-- other tiles ... -->[m
[32m+[m[32m <tile>io.ebean.tile:enhancement:12.12.1</tile>[m
[32m+[m[32m </tiles>[m
[32m+[m[32m </configuration>[m
[32m+[m[32m</plugin>[m
[32m+[m[32m```[m
<p>[m
Use <code>mvn help:effective-pom</code> to view the plugins that the tile brings in.[m
</p>[m
[36m@@ -257,25 +257,25 @@[m
<a href="/docs/query/typesafe#enhancement">query bean enhancement</a>.[m
</p>[m
[m
[31m-<div class="syntax xml"><div class="highlight"><pre><span></span><span class="nt"><plugin></span>[m
[31m- <span class="nt"><groupId></span>io.ebean<span class="nt"></groupId></span>[m
[31m- <span class="nt"><artifactId></span>ebean-maven-plugin<span class="nt"></artifactId></span>[m
[31m- <span class="nt"><version></span><span class='ebean-maven-plugin-version'>${version}</span><span class="nt"></version></span>[m
[31m- <span class="nt"><executions></span>[m
[31m- <span class="nt"><execution></span>[m
[31m- <span class="nt"><id></span>main<span class="nt"></id></span>[m
[31m- <span class="nt"><phase></span>process-classes<span class="nt"></phase></span>[m
[31m- <span class="nt"><configuration></span>[m
[31m- <span class="nt"><transformArgs></span>debug=1<span class="nt"></transformArgs></span>[m
[31m- <span class="nt"></configuration></span>[m
[31m- <span class="nt"><goals></span>[m
[31m- <span class="nt"><goal></span>enhance<span class="nt"></goal></span>[m
[31m- <span class="nt"></goals></span>[m
[31m- <span class="nt"></execution></span>[m
[31m- <span class="nt"></executions></span>[m
[31m-<span class="nt"></plugin></span>[m
[31m-</pre></div>[m
[31m-</div>[m
[32m+[m[32m```xml[m
[32m+[m[32m<plugin>[m
[32m+[m[32m <groupId>io.ebean</groupId>[m
[32m+[m[32m <artifactId>ebean-maven-plugin</artifactId>[m
[32m+[m[32m <version><span class='ebean-maven-plugin-version'>${version}</span></version>[m
[32m+[m[32m <executions>[m
[32m+[m[32m <execution>[m
[32m+[m[32m <id>main</id>[m
[32m+[m[32m <phase>process-classes</phase>[m
[32m+[m[32m <configuration>[m
[32m+[m[32m <transformArgs>debug=1</transformArgs>[m
[32m+[m[32m </configuration>[m
[32m+[m[32m <goals>[m
[32m+[m[32m <goal>enhance</goal>[m
[32m+[m[32m </goals>[m
[32m+[m[32m </execution>[m
[32m+[m[32m </executions>[m
[32m+[m[32m</plugin>[m
[32m+[m[32m```[m
[m
[m
[m
[36m@@ -284,45 +284,45 @@[m
[m
<p>Eclipse can be configured to enhance the classes during build using maven configuration</p>[m
[m
[31m- <div class="syntax xml"><div class="highlight"><pre><span></span><span class="nt"><build></span>[m
[31m- <span class="nt"><plugins></span>[m
[31m- <span class="c"><!-- plugins here --></span>[m
[31m- <span class="nt"></plugins></span>[m
[31m- <span class="nt"><pluginManagement></span>[m
[31m- <span class="nt"><plugins></span>[m
[31m- <span class="c"><!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself. --></span>[m
[31m- <span class="nt"><plugin></span>[m
[31m- <span class="nt"><groupId></span>org.eclipse.m2e<span class="nt"></groupId></span>[m
[31m- <span class="nt"><artifactId></span>lifecycle-mapping<span class="nt"></artifactId></span>[m
[31m- <span class="nt"><version></span>1.0.0<span class="nt"></version></span>[m
[31m- <span class="nt"><configuration></span>[m
[31m- <span class="nt"><lifecycleMappingMetadata></span>[m
[31m- <span class="nt"><pluginExecutions></span>[m
[31m- <span class="nt"><pluginExecution></span>[m
[31m- <span class="nt"><pluginExecutionFilter></span>[m
[31m- <span class="nt"><groupId></span>io.ebean<span class="nt"></groupId></span>[m
[31m- <span class="nt"><artifactId></span>ebean-maven-plugin<span class="nt"></artifactId></span>[m
[31m- <span class="nt"><versionRange></span>[<span class='ebean-maven-plugin-version'>${version}</span>,)<span class="nt"></versionRange></span>[m
[31m- <span class="nt"><goals></span>[m
[31m- <span class="nt"><goal></span>enhance<span class="nt"></goal></span>[m
[31m- <span class="nt"></goals></span>[m
[31m- <span class="nt"></pluginExecutionFilter></span>[m
[31m- <span class="nt"><action></span>[m
[31m- <span class="nt"><execute></span>[m
[31m- <span class="nt"><runOnConfiguration></span>true<span class="nt"></runOnConfiguration></span>[m
[31m- <span class="nt"><runOnIncremental></span>true<span class="nt"></runOnIncremental></span>[m
[31m- <span class="nt"></execute></span>[m
[31m- <span class="nt"></action></span>[m
[31m- <span class="nt"></pluginExecution></span>[m
[31m- <span class="nt"></pluginExecutions></span>[m
[31m- <span class="nt"></lifecycleMappingMetadata></span>[m
[31m- <span class="nt"></configuration></span>[m
[31m- <span class="nt"></plugin></span>[m
[31m- <span class="nt"></plugins></span>[m
[31m- <span class="nt"></pluginManagement></span>[m
[31m-<span class="nt"></build></span>[m
[31m-</pre></div>[m
[31m-</div>[m
[32m+[m[32m ```xml[m
[32m+[m[32m <build>[m
[32m+[m[32m <plugins>[m
[32m+[m[32m <!-- plugins here -->[m
[32m+[m[32m </plugins>[m
[32m+[m[32m <pluginManagement>[m
[32m+[m[32m <plugins>[m
[32m+[m[32m <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself. -->[m
[32m+[m[32m <plugin>[m
[32m+[m[32m <groupId>org.eclipse.m2e</groupId>[m
[32m+[m[32m <artifactId>lifecycle-mapping</artifactId>[m
[32m+[m[32m <version>1.0.0</version>[m
[32m+[m[32m <configuration>[m
[32m+[m[32m <lifecycleMappingMetadata>[m
[32m+[m[32m <pluginExecutions>[m
[32m+[m[32m <pluginExecution>[m
[32m+[m[32m <pluginExecutionFilter>[m
[32m+[m[32m <groupId>io.ebean</groupId>[m
[32m+[m[32m <artifactId>ebean-maven-plugin</artifactId>[m
[32m+[m[32m <versionRange>[<span class='ebean-maven-plugin-version'>${version}</span>,)</versionRange>[m
[32m+[m[32m <goals>[m
[32m+[m[32m <goal>enhance</goal>[m
[32m+[m[32m </goals>[m
[32m+[m[32m </pluginExecutionFilter>[m
[32m+[m[32m <action>[m
[32m+[m[32m <execute>[m
[32m+[m[32m <runOnConfiguration>true</runOnConfiguration>[m
[32m+[m[32m <runOnIncremental>true</runOnIncremental>[m
[32m+[m[32m </execute>[m
[32m+[m[32m </action>[m
[32m+[m[32m </pluginExecution>[m
[32m+[m[32m </pluginExecutions>[m
[32m+[m[32m </lifecycleMappingMetadata>[m
[32m+[m[32m </configuration>[m
[32m+[m[32m </plugin>[m
[32m+[m[32m </plugins>[m
[32m+[m[32m </pluginManagement>[m
[32m+[m[32m </build>[m
[32m+[m[32m ```[m
[m
</div>[m
[m
[36m@@ -339,10 +339,10 @@[m
libraries from apache, google, testing etc.[m
</p>[m
[m
[31m-<div class="syntax xml"><div class="highlight"><pre><span></span>java -javaagent:ebean-agent-<span class='ebean-maven-plugin-version'>${version}</span>.jar MyApplication[m
[32m+[m[32m```xml[m
[32m+[m[32mjava -javaagent:ebean-agent-<span class='ebean-maven-plugin-version'>${version}</span>.jar MyApplication[m
java -javaagent:ebean-agent-<span class='ebean-maven-plugin-version'>${version}</span>.jar=debug=3 MyApplication[m
[31m-</pre></div>[m
[31m-</div>[m
[32m+[m[32m```[m
[m
[m
<p>[m
[36m@@ -489,10 +489,10 @@[m [mjava -javaagent:ebean-agent-<span class='ebean-maven-plugin-version'>${version}<[m
<div class="syntax java"><div class="highlight"><pre><span></span><span class="kn">import</span> <span class="nn">org.avaje.agentloader</span><span class="o">;</span>[m
<span class="o">...</span>[m
<span class="kd">public</span> <span class="kt">void</span> <span class="nf">someApplicationBootupMethod</span><span class="o">()</span> <span class="o">{</span>[m
[31m-<span class="c1">// Load the agent into the running JVM process</span>[m
[31m-<span class="k">if</span> <span class="o">(!</span><span class="n">AgentLoader</span><span class="o">.</span><span class="na">loadAgentFromClasspath</span><span class="o">(</span><span class="s">"ebean-agent"</span><span class="o">,</span><span class="s">"debug=1;packages=org.example.model"</span><span class="o">))</span> <span class="o">{</span>[m
[31m-<span class="n">logger</span><span class="o">.</span><span class="na">info</span><span class="o">(</span><span class="s">"ebean-agent not found in classpath - not dynamically loaded"</span><span class="o">);</span>[m
[31m-<span class="o">}</span>[m
[32m+[m[32m <span class="c1">// Load the agent into the running JVM process</span>[m
[32m+[m[32m <span class="k">if</span> <span class="o">(!</span><span class="n">AgentLoader</span><span class="o">.</span><span class="na">loadAgentFromClasspath</span><span class="o">(</span><span class="s">"ebean-agent"</span><span class="o">,</span><span class="s">"debug=1;packages=org.example.model"</span><span class="o">))</span> <span class="o">{</span>[m
[32m+[m[32m <span class="n">logger</span><span class="o">.</span><span class="na">info</span><span class="o">(</span><span class="s">"ebean-agent not found in classpath - not dynamically loaded"</span><span class="o">);</span>[m
[32m+[m[32m <span class="o">}</span>[m
<span class="o">}</span>[m
</pre></div>[m
</div>[m
[1mdiff --git a/docs/monitoring/index.html b/docs/monitoring/index.html[m
[1mindex abfc64cb..01f970f0 100644[m
[1m--- a/docs/monitoring/index.html[m
[1m+++ b/docs/monitoring/index.html[m
[36m@@ -123,7 +123,8 @@[m
<li>sql - include the sql for queries</li>[m
</ul>[m
[m
[31m-<div class="syntax text"><div class="highlight"><pre><span></span>-- Dumping metrics for db --[m
[32m+[m[32m```text[m
[32m+[m[32m-- Dumping metrics for db --[m
txn.main count:10 total:117459 mean:11745 max:32894[m
[m
-- ORM queries --[m
[36m@@ -131,7 +132,7 @@[m [mquery:CustomerFinder.findByName count:1 total:4089 me[m
hash:8c314fa1f6dbecfcdd449ccd021c8980[m
loc:CustomerFinder.findByName(CustomerFinder.kt:17)[m
[m
[31m-sql:select t0.id, t0.name from customer t0 where lower(t0.name) like ? escape'|'[m
[32m+[m[32msql:select t0.id, t0.name from customer t0 where lower(t0.name) like ? escape'|'[m
[m
query:ProductFinder.findMapBySku count:1 total:2364 mean:2364 max:2364[m
hash:aeda919cc69bea1026543d5307276eeb[m
[36m@@ -140,8 +141,7 @@[m [mloc:ProductFinder.findMapBySku(ProductFinder.kt:12)[m
sql:select t0.id, t0.sku, t0.name, t0.version, t0.when_created, t0.when_modified from product t0[m
[m
...[m
[31m-</pre></div>[m
[31m-</div>[m
[32m+[m[32m```[m
[m
<h2>Metrics</h2>[m
<p>[m
[1mdiff --git a/docs/setup/activerecord.html b/docs/setup/activerecord.html[m
[1mindex d0c933c1..18240e21 100644[m
[1m--- a/docs/setup/activerecord.html[m
[1m+++ b/docs/setup/activerecord.html[m
[36m@@ -204,7 +204,7 @@[m
[m
[m
<h4>Example: extend Model</h4>[m
[31m-<div class="syntax java"><div class="highlight"><pre><span></span><span class="cm">/**</span>[m
[32m+[m[32m <div class="syntax java"><div class="highlight"><pre><span></span><span class="cm">/**</span>[m
<span class="cm"> * Extend Model to get the save(), delete() etc</span>[m
<span class="cm"> * methods on the bean itself (active record style).</span>[m
<span class="cm"> */</span>[m
[36m@@ -222,6 +222,8 @@[m
<span class="n">String</span> <span class="n">comments</span><span class="o">;</span>[m
[m
<span class="o">...</span>[m
[32m+[m
[32m+[m[41m [m
</pre></div>[m
</div>[m
[m
[1mdiff --git a/docs/setup/dbmigration.html b/docs/setup/dbmigration.html[m
[1mindex 75cf0d43..81799970 100644[m
[1m--- a/docs/setup/dbmigration.html[m
[1m+++ b/docs/setup/dbmigration.html[m
[36m@@ -180,30 +180,30 @@[m
If the customer table has @History support this could also add columns to the history table and[m
update the associated db triggers.[m
</p>[m
[31m-<div class="syntax xml"><div class="highlight"><pre><span></span><span class="cp"><?xml version="1.0" encoding="UTF-8" standalone="yes"?></span>[m
[31m-<span class="nt"><migration</span> <span class="na">xmlns=</span><span class="s">"http://ebean-orm.github.io/xml/ns/dbmigration"</span><span class="nt">></span>[m
[31m- <span class="nt"><changeSet</span> <span class="na">type=</span><span class="s">"apply"</span><span class="nt">></span>[m
[31m- <span class="nt"><addColumn</span> <span class="na">tableName=</span><span class="s">"customer"</span><span class="nt">></span>[m
[31m- <span class="nt"><column</span> <span class="na">name=</span><span class="s">"registered"</span> <span class="na">type=</span><span class="s">"date"</span><span class="nt">/></span>[m
[31m- <span class="nt"><column</span> <span class="na">name=</span><span class="s">"comments"</span> <span class="na">type=</span><span class="s">"varchar(1000)"</span><span class="nt">/></span>[m
[31m- <span class="nt"></addColumn></span>[m
[31m- <span class="nt"></changeSet></span>[m
[31m-<span class="nt"></migration></span>[m
[31m-</pre></div>[m
[31m-</div>[m
[32m+[m[32m```xml[m
[32m+[m[32m <?xml version="1.0" encoding="UTF-8" standalone="yes"?>[m
[32m+[m[32m <migration xmlns="http://ebean-orm.github.io/xml/ns/dbmigration">[m
[32m+[m[32m <changeSet type="apply">[m
[32m+[m[32m <addColumn tableName="customer">[m
[32m+[m[32m <column name="registered" type="date"/>[m
[32m+[m[32m <column name="comments" type="varchar(1000)"/>[m
[32m+[m[32m </addColumn>[m
[32m+[m[32m </changeSet>[m
[32m+[m[32m </migration>[m
[32m+[m[32m```[m
[m
<h4>Example migration with pendingDrops</h4>[m
<p>[m
Below is an example migration xml generated with <code>pendingDrops</code> changes.[m
</p>[m
[31m- <div class="syntax xml"><div class="highlight"><pre><span></span><span class="cp"><?xml version="1.0" encoding="UTF-8" standalone="yes"?></span>[m
[31m-<span class="nt"><migration</span> <span class="na">xmlns=</span><span class="s">"http://ebean-orm.github.io/xml/ns/dbmigration"</span><span class="nt">></span>[m
[31m- <span class="nt"><changeSet</span> <span class="na">type=</span><span class="s">"pendingDrops"</span><span class="nt">></span>[m
[31m- <span class="nt"><dropColumn</span> <span class="na">columnName=</span><span class="s">"shortTitle"</span> <span class="na">tableName=</span><span class="s">"document"</span> <span class="na">withHistory=</span><span class="s">"true"</span><span class="nt">/></span>[m
[31m- <span class="nt"></changeSet></span>[m
[31m-<span class="nt"></migration></span>[m
[31m-</pre></div>[m
[31m-</div>[m
[32m+[m[32m ```xml[m
[32m+[m[32m <?xml version="1.0" encoding="UTF-8" standalone="yes"?>[m
[32m+[m[32m <migration xmlns="http://ebean-orm.github.io/xml/ns/dbmigration">[m
[32m+[m[32m <changeSet type="pendingDrops">[m
[32m+[m[32m <dropColumn columnName="shortTitle" tableName="document" withHistory="true"/>[m
[32m+[m[32m </changeSet>[m
[32m+[m[32m </migration>[m
[32m+[m[32m ```[m
<p>[m
Pending drop changes are not incorporated into the apply DDL script unless they are explicitly selected.[m
Once pending drops are applied they drop off the 'pending drops' list.[m
[36m@@ -217,9 +217,9 @@[m
[m
<h2>Applying pending drops</h2>[m
[m
[31m- <div class="syntax text"><div class="highlight"><pre><span></span>INFO c.a.ebean.dbmigration.DbMigration - Pending un-applied drops in versions [1.2][m
[31m-</pre></div>[m
[31m-</div>[m
[32m+[m[32m ```text[m
[32m+[m[32m INFO c.a.ebean.dbmigration.DbMigration - Pending un-applied drops in versions [1.2][m
[32m+[m[32m ```[m
[m
<p>[m
The DB migration will log <code>INFO</code> level messages saying which migrations contain[m
[1mdiff --git a/docs/setup/enhancement.html b/docs/setup/enhancement.html[m
[1mindex 118efca3..f1cfa60a 100644[m
[1m--- a/docs/setup/enhancement.html[m
[1m+++ b/docs/setup/enhancement.html[m
[36m@@ -216,20 +216,20 @@[m
[m
[m
<h5>ebean enhancement tile</h5>[m
[31m- <div class="syntax xml"><div class="highlight"><pre><span></span><span class="nt"><plugin></span>[m
[31m- <span class="nt"><groupId></span>io.repaint.maven<span class="nt"></groupId></span>[m
[31m- <span class="nt"><artifactId></span>tiles-maven-plugin<span class="nt"></artifactId></span>[m
[31m- <span class="nt"><version></span>2.18<span class="nt"></version></span>[m
[31m- <span class="nt"><extensions></span>true<span class="nt"></extensions></span>[m
[31m- <span class="nt"><configuration></span>[m
[31m- <span class="nt"><tiles></span>[m
[31m- <span class="c"><!-- other tiles ... --></span>[m
[31m- <span class="nt"><tile></span>io.ebean.tile:enhancement:12.12.1<span class="nt"></tile></span>[m
[31m- <span class="nt"></tiles></span>[m
[31m- <span class="nt"></configuration></span>[m
[31m-<span class="nt"></plugin></span>[m
[31m-</pre></div>[m
[31m-</div>[m
[32m+[m[32m ```xml[m
[32m+[m[32m <plugin>[m
[32m+[m[32m <groupId>io.repaint.maven</groupId>[m
[32m+[m[32m <artifactId>tiles-maven-plugin</artifactId>[m
[32m+[m[32m <version>2.18</version>[m
[32m+[m[32m <extensions>true</extensions>[m
[32m+[m[32m <configuration>[m
[32m+[m[32m <tiles>[m
[32m+[m[32m <!-- other tiles ... -->[m
[32m+[m[32m <tile>io.ebean.tile:enhancement:12.12.1</tile>[m
[32m+[m[32m </tiles>[m
[32m+[m[32m </configuration>[m
[32m+[m[32m </plugin>[m
[32m+[m[32m ```[m
<p>[m
Use <code>mvn help:effective-pom</code> to view the plugins that the tile brings in.[m
</p>[m
[36m@@ -241,25 +241,25 @@[m
<a href="/docs/query/typesafe#enhancement">query bean enhancement</a>.[m
</p>[m
[m
[31m- <div class="syntax xml"><div class="highlight"><pre><span></span><span class="nt"><plugin></span>[m
[31m- <span class="nt"><groupId></span>io.ebean<span class="nt"></groupId></span>[m
[31m- <span class="nt"><artifactId></span>ebean-maven-plugin<span class="nt"></artifactId></span>[m
[31m- <span class="nt"><version></span><span class='ebean-maven-plugin-version'>${version}</span><span class="nt"></version></span>[m
[31m- <span class="nt"><executions></span>[m
[31m- <span class="nt"><execution></span>[m
[31m- <span class="nt"><id></span>main<span class="nt"></id></span>[m
[31m- <span class="nt"><phase></span>process-classes<span class="nt"></phase></span>[m
[31m- <span class="nt"><configuration></span>[m
[31m- <span class="nt"><transformArgs></span>debug=1<span class="nt"></transformArgs></span>[m
[31m- <span class="nt"></configuration></span>[m
[31m- <span class="nt"><goals></span>[m
[31m- <span class="nt"><goal></span>enhance<span class="nt"></goal></span>[m
[31m- <span class="nt"></goals></span>[m
[31m- <span class="nt"></execution></span>[m
[31m- <span class="nt"></executions></span>[m
[31m-<span class="nt"></plugin></span>[m
[31m-</pre></div>[m
[31m-</div>[m
[32m+[m[32m ```xml[m
[32m+[m[32m <plugin>[m
[32m+[m[32m <groupId>io.ebean</groupId>[m
[32m+[m[32m <artifactId>ebean-maven-plugin</artifactId>[m
[32m+[m[32m <version><span class='ebean-maven-plugin-version'>${version}</span></version>[m
[32m+[m[32m <executions>[m
[32m+[m[32m <execution>[m
[32m+[m[32m <id>main</id>[m
[32m+[m[32m <phase>process-classes</phase>[m
[32m+[m[32m <configuration>[m
[32m+[m[32m <transformArgs>debug=1</transformArgs>[m
[32m+[m[32m </configuration>[m
[32m+[m[32m <goals>[m
[32m+[m[32m <goal>enhance</goal>[m
[32m+[m[32m </goals>[m
[32m+[m[32m </execution>[m
[32m+[m[32m </executions>[m
[32m+[m[32m </plugin>[m
[32m+[m[32m ```[m
[m
[m
[m
[36m@@ -268,45 +268,45 @@[m
[m
<p>Eclipse can be configured to enhance the classes during build using maven configuration</p>[m
[m
[31m- <div class="syntax xml"><div class="highlight"><pre><span></span><span class="nt"><build></span>[m
[31m- <span class="nt"><plugins></span>[m
[31m- <span class="c"><!-- plugins here --></span>[m
[31m- <span class="nt"></plugins></span>[m
[31m- <span class="nt"><pluginManagement></span>[m
[31m- <span class="nt"><plugins></span>[m
[31m- <span class="c"><!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself. --></span>[m
[31m- <span class="nt"><plugin></span>[m
[31m- <span class="nt"><groupId></span>org.eclipse.m2e<span class="nt"></groupId></span>[m
[31m- <span class="nt"><artifactId></span>lifecycle-mapping<span class="nt"></artifactId></span>[m
[31m- <span class="nt"><version></span>1.0.0<span class="nt"></version></span>[m
[31m- <span class="nt"><configuration></span>[m
[31m- <span class="nt"><lifecycleMappingMetadata></span>[m
[31m- <span class="nt"><pluginExecutions></span>[m
[31m- <span class="nt"><pluginExecution></span>[m
[31m- <span class="nt"><pluginExecutionFilter></span>[m
[31m- <span class="nt"><groupId></span>io.ebean<span class="nt"></groupId></span>[m
[31m- <span class="nt"><artifactId></span>ebean-maven-plugin<span class="nt"></artifactId></span>[m
[31m- <span class="nt"><versionRange></span>[<span class='ebean-maven-plugin-version'>${version}</span>,)<span class="nt"></versionRange></span>[m
[31m- <span class="nt"><goals></span>[m
[31m- <span class="nt"><goal></span>enhance<span class="nt"></goal></span>[m
[31m- <span class="nt"></goals></span>[m
[31m- <span class="nt"></pluginExecutionFilter></span>[m
[31m- <span class="nt"><action></span>[m
[31m- <span class="nt"><execute></span>[m
[31m- <span class="nt"><runOnConfiguration></span>true<span class="nt"></runOnConfiguration></span>[m
[31m- <span class="nt"><runOnIncremental></span>true<span class="nt"></runOnIncremental></span>[m
[31m- <span class="nt"></execute></span>[m
[31m- <span class="nt"></action></span>[m
[31m- <span class="nt"></pluginExecution></span>[m
[31m- <span class="nt"></pluginExecutions></span>[m
[31m- <span class="nt"></lifecycleMappingMetadata></span>[m
[31m- <span class="nt"></configuration></span>[m
[31m- <span class="nt"></plugin></span>[m
[31m- <span class="nt"></plugins></span>[m
[31m- <span class="nt"></pluginManagement></span>[m
[31m-<span class="nt"></build></span>[m
[31m-</pre></div>[m
[31m-</div>[m
[32m+[m[32m ```xml[m
[32m+[m[32m <build>[m
[32m+[m[32m <plugins>[m
[32m+[m[32m <!-- plugins here -->[m
[32m+[m[32m </plugins>[m
[32m+[m[32m <pluginManagement>[m
[32m+[m[32m <plugins>[m
[32m+[m[32m <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself. -->[m
[32m+[m[32m <plugin>[m
[32m+[m[32m <groupId>org.eclipse.m2e</groupId>[m
[32m+[m[32m <artifactId>lifecycle-mapping</artifactId>[m
[32m+[m[32m <version>1.0.0</version>[m
[32m+[m[32m <configuration>[m
[32m+[m[32m <lifecycleMappingMetadata>[m
[32m+[m[32m <pluginExecutions>[m
[32m+[m[32m <pluginExecution>[m
[32m+[m[32m <pluginExecutionFilter>[m
[32m+[m[32m <groupId>io.ebean</groupId>[m
[32m+[m[32m <artifactId>ebean-maven-plugin</artifactId>[m
[32m+[m[32m <versionRange>[<span class='ebean-maven-plugin-version'>${version}</span>,)</versionRange>[m
[32m+[m[32m <goals>[m
[32m+[m[32m <goal>enhance</goal>[m
[32m+[m[32m </goals>[m
[32m+[m[32m </pluginExecutionFilter>[m
[32m+[m[32m <action>[m
[32m+[m[32m <execute>[m
[32m+[m[32m <runOnConfiguration>true</runOnConfiguration>[m
[32m+[m[32m <runOnIncremental>true</runOnIncremental>[m
[32m+[m[32m </execute>[m
[32m+[m[32m </action>[m
[32m+[m[32m </pluginExecution>[m
[32m+[m[32m </pluginExecutions>[m
[32m+[m[32m </lifecycleMappingMetadata>[m
[32m+[m[32m </configuration>[m
[32m+[m[32m </plugin>[m
[32m+[m[32m </plugins>[m
[32m+[m[32m </pluginManagement>[m
[32m+[m[32m </build>[m
[32m+[m[32m ```[m
[m
</div>[m
[m
[36m@@ -323,10 +323,10 @@[m
libraries from apache, google, testing etc.[m
</p>[m
[m
[31m-<div class="syntax xml"><div class="highlight"><pre><span></span>java -javaagent:ebean-agent-<span class='ebean-maven-plugin-version'>${version}</span>.jar MyApplication[m
[32m+[m[32m```xml[m
[32m+[m[32mjava -javaagent:ebean-agent-<span class='ebean-maven-plugin-version'>${version}</span>.jar MyApplication[m
java -javaagent:ebean-agent-<span class='ebean-maven-plugin-version'>${version}</span>.jar=debug=3 MyApplication[m
[31m-</pre></div>[m
[31m-</div>[m
[32m+[m[32m```[m
[m
[m
<p>[m
[36m@@ -470,7 +470,7 @@[m [mjava -javaagent:ebean-agent-<span class='ebean-maven-plugin-version'>${version}<[m
The code below loads the enhancer agent programmatically onto the running JVM.[m
</p>[m
[m
[31m- <div class="syntax java"><div class="highlight"><pre><span></span><span class="kn">import</span> <span class="nn">org.avaje.agentloader</span><span class="o">;</span>[m
[32m+[m[32m<div class="syntax java"><div class="highlight"><pre><span></span><span class="kn">import</span> <span class="nn">org.avaje.agentloader</span><span class="o">;</span>[m
<span class="o">...</span>[m
<span class="kd">public</span> <span class="kt">void</span> <span class="nf">someApplicationBootupMethod</span><span class="o">()</span> <span class="o">{</span>[m
<span class="c1">// Load the agent into the running JVM process</span>[m
[36m@@ -491,24 +491,24 @@[m [mjava -javaagent:ebean-agent-<span class='ebean-maven-plugin-version'>${version}<[m
<li>Create a target that uses the AntEnhanceTask to enhance the entity classes.</li>[m
</ol>[m
[m
[31m- <div class="syntax xml"><div class="highlight"><pre><span></span><span class="nt"><taskdef</span>[m
[31m- <span class="na">name=</span><span class="s">"ebeanEnhance"</span>[m
[31m- <span class="na">classname=</span><span class="s">"io.ebean.enhance.ant.AntEnhanceTask"</span>[m
[31m- <span class="na">classpath=</span><span class="s">"your_path_to/ebean-x.x.x.jar"</span><span class="nt">/></span>[m
[31m-[m
[31m-<span class="nt"><target</span> <span class="na">name=</span><span class="s">"ormEnhance"</span> <span class="na">depends=</span><span class="s">"clean,compile"</span><span class="nt">></span>[m
[31m- <span class="c"><!--</span>[m
[31m-<span class="c"> classSource: This is the directory that contains your class files. That is, the directory where your IDE will compile your java class files to, or the directory where a previous ant task will compile your java class files to.</span>[m
[31m-[m
[31m-<span class="c"> packages: a comma delimited list of packages that contain entity classes. All the classes in these packages are searched for entity classes to be enhanced. transformArgs: This contains a debug level (0 - 10) .</span>[m
[31m-<span class="c"> --></span>[m
[31m- <span class="nt"><ebeanEnhance</span>[m
[31m- <span class="na">classSource=</span><span class="s">"your_classes_directory"</span>[m
[31m- <span class="na">packages=</span><span class="s">"app.domain.*"</span>[m
[31m- <span class="na">transformArgs=</span><span class="s">"debug=1"</span><span class="nt">/></span>[m
[31m-<span class="nt"></target></span>[m
[31m-</pre></div>[m
[31m-</div>[m
[32m+[m[32m ```xml[m
[32m+[m[32m <taskdef[m
[32m+[m[32m name="ebeanEnhance"[m
[32m+[m[32m classname="io.ebean.enhance.ant.AntEnhanceTask"[m
[32m+[m[32m classpath="your_path_to/ebean-x.x.x.jar"/>[m
[32m+[m
[32m+[m[32m <target name="ormEnhance" depends="clean,compile">[m
[32m+[m[32m <!--[m
[32m+[m[32m classSource: This is the directory that contains your class files. That is, the directory where your IDE will compile your java class files to, or the directory where a previous ant task will compile your java class files to.[m
[32m+[m
[32m+[m[32m packages: a comma delimited list of packages that contain entity classes. All the classes in these packages are searched for entity classes to be enhanced. transformArgs: This contains a debug level (0 - 10) .[m
[32m+[m[32m -->[m
[32m+[m[32m <ebeanEnhance[m
[32m+[m[32m classSource="your_classes_directory"[m
[32m+[m[32m packages="app.domain.*"[m
[32m+[m[32m transformArgs="debug=1"/>[m
[32m+[m[32m </target>[m
[32m+[m[32m ```[m
[m
<div style="display: none">[m
<h2>Programmatic enhancement</h2>[m
[1mdiff --git a/docs/setup/guice.html b/docs/setup/guice.html[m
[1mindex 1aad954a..aa5515c5 100644[m
[1m--- a/docs/setup/guice.html[m
[1m+++ b/docs/setup/guice.html[m
[36m@@ -82,7 +82,7 @@[m
Example provider implementation using <code>DatabaseConfig</code> and <code>DatabaseFactory</code>.[m
</p>[m
[m
[31m-<div class="syntax java"><div class="highlight"><pre><span></span><span class="kn">import</span> <span class="nn">io.ebean.Ebean</span><span class="o">;</span>[m
[32m+[m[32m <div class="syntax java"><div class="highlight"><pre><span></span><span class="kn">import</span> <span class="nn">io.ebean.Ebean</span><span class="o">;</span>[m
<span class="kn">import</span> <span class="nn">io.ebean.EbeanServer</span><span class="o">;</span>[m
<span class="kn">import</span> <span class="nn">com.google.inject.Provider</span><span class="o">;</span>[m
[m
[36m@@ -110,7 +110,7 @@[m
Example provider implementation using <code>Ebean</code> that implicitly creates the[m
<code>default</code> EbeanServer using ebean.properties.[m
</p>[m
[31m-<div class="syntax java"><div class="highlight"><pre><span></span><span class="kn">import</span> <span class="nn">io.ebean.Ebean</span><span class="o">;</span>[m
[32m+[m[32m <div class="syntax java"><div class="highlight"><pre><span></span><span class="kn">import</span> <span class="nn">io.ebean.Ebean</span><span class="o">;</span>[m
<span class="kn">import</span> <span class="nn">io.ebean.EbeanServer</span><span class="o">;</span>[m
<span class="kn">import</span> <span class="nn">com.google.inject.Provider</span><span class="o">;</span>[m
[m
[36m@@ -130,7 +130,7 @@[m
In the Guice module bind the provider using eager singleton so that the EbeanServer is[m
created eagerly at startup.[m
</p>[m
[31m-<div class="syntax java"><div class="highlight"><pre><span></span><span class="c1">// bind the provider as eager singleton</span>[m
[32m+[m[32m <div class="syntax java"><div class="highlight"><pre><span></span><span class="c1">// bind the provider as eager singleton</span>[m
<span class="n">bind</span><span class="o">(</span><span class="n">EbeanServer</span><span class="o">.</span><span class="na">class</span><span class="o">).</span><span class="na">toProvider</span><span class="o">(</span><span class="n">EbeanServerProvider</span><span class="o">.</span><span class="na">class</span><span class="o">).</span><span class="na">asEagerSingleton</span><span class="o">()</span>[m
</pre></div>[m
</div>[m
[1mdiff --git a/docs/setup/spring.html b/docs/setup/spring.html[m
[1mindex b4263ebd..f05e94fa 100644[m
[1m--- a/docs/setup/spring.html[m
[1m+++ b/docs/setup/spring.html[m
[36m@@ -75,7 +75,7 @@[m
<h2 id="spring-boot">Spring boot</h2>[m
<p>[m
Ebean is now aware of Spring boot runnable jar structure (for scanning the classpath). There is an[m
[31m- <a href="https://github.com/ebean-orm/example-springboot">example application<a/> showing:[m
[32m+[m[32m <a href="https://github.com/ebean-orm/example-springboot">example application</a> showing:[m
</p>[m
<ul>[m
<li><a href="https://github.com/ebean-orm/example-springboot/blob/master/src/main/java/org/example/sboot/service/EbeanFactoryBean.java">Factory Bean (programmatic configuration of EbeanServer)</a></li>[m
[1mdiff --git a/docs/setup/test-properties.html b/docs/setup/test-properties.html[m
[1mindex 08c95e8d..c16cca5b 100644[m
[1m--- a/docs/setup/test-properties.html[m
[1m+++ b/docs/setup/test-properties.html[m
[36m@@ -88,17 +88,17 @@[m
</p>[m
[m
<h3>Example test-ebean.properties</h3>[m
[31m-<div class="syntax properties"><div class="highlight"><pre><span></span><span class="c">## Create DB from scratch prior to running tests</span>[m
[31m-<span class="na">ebean.db.ddl.generate</span><span class="o">=</span><span class="s">true</span>[m
[31m-<span class="na">ebean.db.ddl.run</span><span class="o">=</span><span class="s">true</span>[m
[31m-[m
[31m-<span class="c">## Use H2 when running tests</span>[m
[31m-<span class="na">datasource.db.username</span><span class="o">=</span><span class="s">sa</span>[m
[31m-<span class="na">datasource.db.password</span><span class="o">=</span>[m
[31m-<span class="na">datasource.db.databaseUrl</span><span class="o">=</span><span class="s">jdbc:h2:mem:tests</span>[m
[31m-<span class="na">datasource.db.databaseDriver</span><span class="o">=</span><span class="s">org.h2.Driver</span>[m
[31m-</pre></div>[m
[31m-</div>[m
[32m+[m[32m```properties[m
[32m+[m[32m ## Create DB from scratch prior to running tests[m
[32m+[m[32m ebean.db.ddl.generate=true[m
[32m+[m[32m ebean.db.ddl.run=true[m
[32m+[m
[32m+[m[32m ## Use H2 when running tests[m
[32m+[m[32m datasource.db.username=sa[m
[32m+[m[32m datasource.db.password=[m
[32m+[m[32m datasource.db.databaseUrl=jdbc:h2:mem:tests[m
[32m+[m[32m datasource.db.databaseDriver=org.h2.Driver[m
[32m+[m[32m```[m
[m
<h3>Programmatic - loadTestProperties()</h3>[m
<p>[m
[1mdiff --git a/docs/setup/testing.html b/docs/setup/testing.html[m
[1mindex b9238d20..ddf45701 100644[m
[1m--- a/docs/setup/testing.html[m
[1m+++ b/docs/setup/testing.html[m
[36m@@ -110,7 +110,7 @@[m
</div>[m
[m
<h3>Example test-ebean.properties</h3>[m
[31m-<div class="syntax properties"><div class="highlight"><pre><span></span><span class="na">ebean.db.ddl.generate</span><span class="o">=</span><span class="s">true</span>[m
[32m+[m[32m <div class="syntax properties"><div class="highlight"><pre><span></span><span class="na">ebean.db.ddl.generate</span><span class="o">=</span><span class="s">true</span>[m
<span class="na">ebean.db.ddl.run</span><span class="o">=</span><span class="s">true</span>[m
[m
<span class="na">datasource.db.username</span><span class="o">=</span><span class="s">sa</span>[m
[36m@@ -132,7 +132,7 @@[m [mMocking with Ebean singleton[m
replacing the default EbeanServer instance with a mock.[m
</p>[m
[m
[31m-<div class="syntax java"><div class="highlight"><pre><span></span><span class="o">...</span>[m
[32m+[m[32m <div class="syntax java"><div class="highlight"><pre><span></span><span class="o">...</span>[m
<span class="kn">import</span> <span class="nn">io.ebeaninternal.server.core.DefaultServer</span><span class="o">;</span>[m
<span class="o">...</span>[m
[m
[36m@@ -176,10 +176,12 @@[m [mreplacing the default EbeanServer instance with a mock.[m
<span class="n">EbeanServer</span> <span class="n">restoredServer</span> <span class="o">=</span> <span class="n">Ebean</span><span class="o">.</span><span class="na">getDefaultServer</span><span class="o">();</span>[m
<span class="n">assertTrue</span><span class="o">(</span><span class="s">"is a real EbeanServer"</span><span class="o">,</span> <span class="n">restoredServer</span> <span class="k">instanceof</span> <span class="n">DefaultServer</span><span class="o">);</span>[m
<span class="o">}</span>[m
[32m+[m
[32m+[m[41m [m
</pre></div>[m
</div>[m
<h4>MockiEbean Maven dependency</h4>[m
[31m-<div class="syntax xml"><div class="highlight"><pre><span></span><span class="nt"><dependency></span>[m
[32m+[m[32m <div class="syntax xml"><div class="highlight"><pre><span></span><span class="nt"><dependency></span>[m
<span class="nt"><groupId></span>io.ebean<span class="nt"></groupId></span>[m
<span class="nt"><artifactId></span>ebean-mocker<span class="nt"></artifactId></span>[m
<span class="nt"><version></span>12.12.1<span class="nt"></version></span>[m