Repository navigation
Expand file tree
/
Copy pathsample-report.html
More file actions
5111 lines (5111 loc) · 317 KB
/
Copy pathsample-report.html
File metadata and controls
5111 lines (5111 loc) · 317 KB
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
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Tree Shaking Report</title>
<style>
:root {
--bg: #fbfaf8; --surface: #ffffff; --text: #1d1d1f; --muted: #6b6b70; --border: #e4e2dd;
--kept: #3b7d5c; --gone: #c9553f; --gone-soft: #f6e3de; --kept-soft: #e0efe6;
--code-bg: #f4f2ee;
}
@media (prefers-color-scheme: dark) {
:root:not([data-theme="light"]) {
--bg: #161617; --surface: #1f1f21; --text: #ececee; --muted: #9a9aa0; --border: #333336;
--kept: #5fb88a; --gone: #e2775f; --gone-soft: #3a2420; --kept-soft: #1d3327;
--code-bg: #19191b;
}
}
:root[data-theme="dark"] {
--bg: #161617; --surface: #1f1f21; --text: #ececee; --muted: #9a9aa0; --border: #333336;
--kept: #5fb88a; --gone: #e2775f; --gone-soft: #3a2420; --kept-soft: #1d3327;
--code-bg: #19191b;
}
* { box-sizing: border-box; }
body { margin: 0; background: var(--bg); color: var(--text); font: 15px/1.5 -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif; }
main { max-width: 1100px; margin: 0 auto; padding: 32px 16px 64px; }
h1 { font-size: 28px; margin: 0 0 4px; }
h2 { font-size: 19px; margin: 40px 0 12px; }
.muted { color: var(--muted); font-size: 13px; }
code { font-family: ui-monospace, SFMono-Regular, Menlo, monospace; font-size: 13px; }
.tiles { display: grid; grid-template-columns: repeat(auto-fit, minmax(170px, 1fr)); gap: 12px; margin-top: 24px; }
.tile { background: var(--surface); border: 1px solid var(--border); border-radius: 10px; padding: 14px 16px; }
.tile .label { color: var(--muted); font-size: 13px; }
.tile .value { font-size: 26px; font-weight: 600; font-variant-numeric: tabular-nums; }
.tile .sub { color: var(--muted); font-size: 13px; font-variant-numeric: tabular-nums; }
.scroll { overflow-x: auto; background: var(--surface); border: 1px solid var(--border); border-radius: 10px; }
table { border-collapse: collapse; width: 100%; }
th, td { padding: 6px 12px; border-bottom: 1px solid var(--border); text-align: left; white-space: nowrap; }
th { font-size: 12px; text-transform: uppercase; letter-spacing: .04em; color: var(--muted); font-weight: 600; }
td.n { text-align: right; font-variant-numeric: tabular-nums; }
tr.gone td:first-child code { color: var(--gone); text-decoration: line-through; }
tr.intact td:first-child code { color: var(--kept); }
.bar { display: inline-flex; width: 120px; height: 8px; border-radius: 4px; overflow: hidden; vertical-align: middle; background: var(--border); }
.bar .kept { background: var(--kept); } .bar .gone { background: var(--gone); opacity: .55; }
details { background: var(--surface); border: 1px solid var(--border); border-radius: 8px; margin: 6px 0; }
summary { cursor: pointer; padding: 8px 12px; display: flex; flex-wrap: wrap; gap: 8px; align-items: center; }
summary .bar { margin-left: auto; }
ul.cols { columns: 3 240px; margin: 0; padding: 4px 12px 12px 32px; }
pre.diff { margin: 0; padding: 12px; background: var(--code-bg); overflow-x: auto; font: 12px/1.45 ui-monospace, Menlo, monospace; border-top: 1px solid var(--border); }
pre.diff span { display: block; }
pre.diff .add { background: var(--kept-soft); } pre.diff .del { background: var(--gone-soft); }
pre.diff .hunk { color: var(--muted); }
.legend span { display: inline-flex; align-items: center; gap: 6px; margin-right: 16px; }
.swatch { width: 10px; height: 10px; border-radius: 2px; display: inline-block; }
.inputs { display: grid; grid-template-columns: minmax(200px, 1fr) minmax(280px, 2fr) minmax(220px, 1fr); gap: 12px; margin-bottom: 8px; }
@media (max-width: 800px) { .inputs { grid-template-columns: 1fr; } }
.inputs .tile { min-width: 0; overflow-x: auto; }
table.plain th, table.plain td { padding: 4px 8px 4px 0; }
table.plain { margin-top: 8px; }
ul.plainlist { list-style: none; padding: 0; margin: 4px 0 0; }
</style>
</head>
<body>
<main>
<h1>Tree Shaking Report</h1>
<div class="muted">ApprovalTests 31.0.0 · 9 entry points from <code>approvaltests-selection.json</code> · original vs. partial</div>
<div class="tiles">
<div class="tile"><div class="label">Source files</div><div class="value">143 <span class="sub">/ 448</span></div><div class="sub">305 deleted · 43 changed · 100 untouched</div></div>
<div class="tile"><div class="label">Lines of source</div><div class="value">20%</div><div class="sub">5,849 of 29,097 kept</div></div>
<div class="tile"><div class="label">Compiled .class files</div><div class="value">161 <span class="sub">/ 542</span></div><div class="sub">295 KB of 1,313 KB (22%)</div></div>
<div class="tile"><div class="label">Jar size</div><div class="value">252 KB</div><div class="sub">vs. 948 KB for the original jars (27%)</div></div>
<div class="tile"><div class="label">Third-party packages</div><div class="value">5 <span class="sub">/ 16</span></div><div class="sub">still imported</div></div>
</div>
<h2>Inputs</h2>
<div class="inputs">
<div class="tile">
<div class="label">Selection file</div><div><code>approvaltests-selection.json</code></div><div class="sub">path/to/ApprovalTests.java.StarterProject</div>
<div class="label" style="margin-top:12px">ApprovalTests version</div><div class="value">31.0.0</div><div class="sub">cloned from the <code>31.0.0</code> tag of approvals/ApprovalTests.Java</div>
</div>
<div class="tile">
<div class="label">Entry points you selected (9)</div><div class="sub">Everything kept is reachable from these. Everything else is deleted.</div>
<table class="plain"><tr><th>Call</th><th>Kind</th><th>Package</th></tr><tr><td><code>approvaltests.<b>Approvals</b></code></td><td>field</td><td><code class="muted">org</code></td></tr><tr><td><code>Approvals.<b>verify(String)</b></code></td><td>method</td><td><code class="muted">org.approvaltests</code></td></tr><tr><td><code>approvaltests.<b>JsonApprovals</b></code></td><td>field</td><td><code class="muted">org</code></td></tr><tr><td><code>JsonApprovals.<b>verifyAsJson(Object)</b></code></td><td>method</td><td><code class="muted">org.approvaltests</code></td></tr><tr><td><code>core.<b>ApprovalFailureReporter</b></code></td><td>field</td><td><code class="muted">org.approvaltests</code></td></tr><tr><td><code>core.<b>Options</b></code></td><td>field</td><td><code class="muted">org.approvaltests</code></td></tr><tr><td><code>reporters.<b>DiffReporter</b></code></td><td>field</td><td><code class="muted">org.approvaltests</code></td></tr><tr><td><code>DiffReporter.<b>INSTANCE</b></code></td><td>field</td><td><code class="muted">org.approvaltests.reporters</code></td></tr><tr><td><code>reporters.<b>UseReporter</b></code></td><td>field</td><td><code class="muted">org.approvaltests</code></td></tr></table>
</div>
<div class="tile">
<div class="label">Runtime discoveries</div><table class="plain"><tr><th>Discovery</th><th>Mode</th></tr><tr><td><code>everything</code></td><td>keep — works normally</td></tr></table>
<div class="label" style="margin-top:12px">Output</div><ul class="plainlist"><li><span class="muted">jar:</span> <code>approvaltests-31.0.0-custom.jar</code></li><li><span class="muted">directory:</span> <code>path/to/ApprovalTests.java.StarterProject/target/approvaltests-custom</code></li></ul>
</div>
</div>
<details><summary>Raw <code>approvaltests-selection.json</code></summary><pre class="diff">{
"approvaltestsVersion": "31.0.0",
"entryPoints": [
"org.approvaltests.Approvals",
"org.approvaltests.Approvals.verify(java.lang.String)",
"org.approvaltests.JsonApprovals",
"org.approvaltests.JsonApprovals.verifyAsJson(java.lang.Object)",
"org.approvaltests.core.ApprovalFailureReporter",
"org.approvaltests.core.Options",
"org.approvaltests.reporters.DiffReporter",
"org.approvaltests.reporters.DiffReporter.INSTANCE",
"org.approvaltests.reporters.UseReporter"
],
"runtimeDiscoveries": {
"*": "keep"
},
"output": {
"directory": "target/approvaltests-custom",
"version": "31.0.0-custom",
"pom": true,
"sources": true,
"install": "none"
}
}
</pre></details>
<h2>By module</h2>
<div class="scroll"><table>
<tr><th>Module</th><th>Files</th><th>Kept</th><th>Lines before</th><th>Lines after</th><th>Kept</th><th></th></tr>
<tr><td><code>approvaltests-util</code></td><td class="n">265</td><td class="n">54</td><td class="n">20,693</td><td class="n">3,191</td><td class="n">15%</td><td><div class="bar" title="15% kept"><span class="kept" style="width:15%"></span><span class="gone" style="width:85%"></span></div></td></tr>
<tr><td><code>approvaltests</code></td><td class="n">183</td><td class="n">89</td><td class="n">8,404</td><td class="n">2,658</td><td class="n">32%</td><td><div class="bar" title="32% kept"><span class="kept" style="width:32%"></span><span class="gone" style="width:68%"></span></div></td></tr>
</table></div>
<h2>By package</h2>
<div class="legend muted"><span><i class="swatch" style="background:var(--kept)"></i>kept</span><span><i class="swatch" style="background:var(--gone);opacity:.55"></i>removed</span><span>struck-through = whole package removed</span></div>
<div class="scroll"><table>
<tr><th>Package</th><th>Files</th><th>Deleted</th><th>Changed</th><th>Lines before</th><th>Lines after</th><th>Kept</th><th></th></tr>
<tr class="gone"><td><code>com.spun.swing</code></td><td class="n">4</td><td class="n">4</td><td class="n">0</td><td class="n">68</td><td class="n">0</td><td class="n">0%</td><td><div class="bar" title="0% kept"><span class="kept" style="width:0%"></span><span class="gone" style="width:100%"></span></div></td></tr>
<tr class="partial"><td><code>com.spun.util</code></td><td class="n">55</td><td class="n">39</td><td class="n">9</td><td class="n">7,223</td><td class="n">813</td><td class="n">11%</td><td><div class="bar" title="11% kept"><span class="kept" style="width:11%"></span><span class="gone" style="width:89%"></span></div></td></tr>
<tr class="partial"><td><code>com.spun.util.database</code></td><td class="n">28</td><td class="n">27</td><td class="n">1</td><td class="n">2,590</td><td class="n">52</td><td class="n">2%</td><td><div class="bar" title="2% kept"><span class="kept" style="width:2%"></span><span class="gone" style="width:98%"></span></div></td></tr>
<tr class="gone"><td><code>com.spun.util.database.automaticsetter</code></td><td class="n">7</td><td class="n">7</td><td class="n">0</td><td class="n">260</td><td class="n">0</td><td class="n">0%</td><td><div class="bar" title="0% kept"><span class="kept" style="width:0%"></span><span class="gone" style="width:100%"></span></div></td></tr>
<tr class="gone"><td><code>com.spun.util.date</code></td><td class="n">2</td><td class="n">2</td><td class="n">0</td><td class="n">197</td><td class="n">0</td><td class="n">0%</td><td><div class="bar" title="0% kept"><span class="kept" style="width:0%"></span><span class="gone" style="width:100%"></span></div></td></tr>
<tr class="gone"><td><code>com.spun.util.filters</code></td><td class="n">8</td><td class="n">8</td><td class="n">0</td><td class="n">109</td><td class="n">0</td><td class="n">0%</td><td><div class="bar" title="0% kept"><span class="kept" style="width:0%"></span><span class="gone" style="width:100%"></span></div></td></tr>
<tr class="gone"><td><code>com.spun.util.images</code></td><td class="n">1</td><td class="n">1</td><td class="n">0</td><td class="n">80</td><td class="n">0</td><td class="n">0%</td><td><div class="bar" title="0% kept"><span class="kept" style="width:0%"></span><span class="gone" style="width:100%"></span></div></td></tr>
<tr class="gone"><td><code>com.spun.util.introspection</code></td><td class="n">2</td><td class="n">2</td><td class="n">0</td><td class="n">45</td><td class="n">0</td><td class="n">0%</td><td><div class="bar" title="0% kept"><span class="kept" style="width:0%"></span><span class="gone" style="width:100%"></span></div></td></tr>
<tr class="partial"><td><code>com.spun.util.io</code></td><td class="n">17</td><td class="n">14</td><td class="n">2</td><td class="n">1,644</td><td class="n">252</td><td class="n">15%</td><td><div class="bar" title="15% kept"><span class="kept" style="width:15%"></span><span class="gone" style="width:85%"></span></div></td></tr>
<tr class="gone"><td><code>com.spun.util.io.filefilters</code></td><td class="n">3</td><td class="n">3</td><td class="n">0</td><td class="n">52</td><td class="n">0</td><td class="n">0%</td><td><div class="bar" title="0% kept"><span class="kept" style="width:0%"></span><span class="gone" style="width:100%"></span></div></td></tr>
<tr class="gone"><td><code>com.spun.util.io.xml</code></td><td class="n">10</td><td class="n">10</td><td class="n">0</td><td class="n">491</td><td class="n">0</td><td class="n">0%</td><td><div class="bar" title="0% kept"><span class="kept" style="width:0%"></span><span class="gone" style="width:100%"></span></div></td></tr>
<tr class="partial"><td><code>com.spun.util.logger</code></td><td class="n">7</td><td class="n">4</td><td class="n">2</td><td class="n">729</td><td class="n">297</td><td class="n">41%</td><td><div class="bar" title="41% kept"><span class="kept" style="width:41%"></span><span class="gone" style="width:59%"></span></div></td></tr>
<tr class="gone"><td><code>com.spun.util.markdown</code></td><td class="n">1</td><td class="n">1</td><td class="n">0</td><td class="n">6</td><td class="n">0</td><td class="n">0%</td><td><div class="bar" title="0% kept"><span class="kept" style="width:0%"></span><span class="gone" style="width:100%"></span></div></td></tr>
<tr class="gone"><td><code>com.spun.util.markdown.table</code></td><td class="n">6</td><td class="n">6</td><td class="n">0</td><td class="n">278</td><td class="n">0</td><td class="n">0%</td><td><div class="bar" title="0% kept"><span class="kept" style="width:0%"></span><span class="gone" style="width:100%"></span></div></td></tr>
<tr class="partial"><td><code>com.spun.util.parser</code></td><td class="n">14</td><td class="n">10</td><td class="n">4</td><td class="n">1,376</td><td class="n">172</td><td class="n">13%</td><td><div class="bar" title="13% kept"><span class="kept" style="width:13%"></span><span class="gone" style="width:87%"></span></div></td></tr>
<tr class="partial"><td><code>com.spun.util.persistence</code></td><td class="n">9</td><td class="n">8</td><td class="n">0</td><td class="n">149</td><td class="n">8</td><td class="n">5%</td><td><div class="bar" title="5% kept"><span class="kept" style="width:5%"></span><span class="gone" style="width:95%"></span></div></td></tr>
<tr class="gone"><td><code>com.spun.util.persistence.test</code></td><td class="n">3</td><td class="n">3</td><td class="n">0</td><td class="n">55</td><td class="n">0</td><td class="n">0%</td><td><div class="bar" title="0% kept"><span class="kept" style="width:0%"></span><span class="gone" style="width:100%"></span></div></td></tr>
<tr class="gone"><td><code>com.spun.util.quartz</code></td><td class="n">1</td><td class="n">1</td><td class="n">0</td><td class="n">26</td><td class="n">0</td><td class="n">0%</td><td><div class="bar" title="0% kept"><span class="kept" style="width:0%"></span><span class="gone" style="width:100%"></span></div></td></tr>
<tr class="gone"><td><code>com.spun.util.servlets</code></td><td class="n">2</td><td class="n">2</td><td class="n">0</td><td class="n">239</td><td class="n">0</td><td class="n">0%</td><td><div class="bar" title="0% kept"><span class="kept" style="width:0%"></span><span class="gone" style="width:100%"></span></div></td></tr>
<tr class="gone"><td><code>com.spun.util.sql</code></td><td class="n">3</td><td class="n">3</td><td class="n">0</td><td class="n">1,386</td><td class="n">0</td><td class="n">0%</td><td><div class="bar" title="0% kept"><span class="kept" style="width:0%"></span><span class="gone" style="width:100%"></span></div></td></tr>
<tr class="partial"><td><code>com.spun.util.tests</code></td><td class="n">7</td><td class="n">1</td><td class="n">1</td><td class="n">393</td><td class="n">202</td><td class="n">51%</td><td><div class="bar" title="51% kept"><span class="kept" style="width:51%"></span><span class="gone" style="width:49%"></span></div></td></tr>
<tr class="gone"><td><code>com.spun.util.timers</code></td><td class="n">8</td><td class="n">8</td><td class="n">0</td><td class="n">674</td><td class="n">0</td><td class="n">0%</td><td><div class="bar" title="0% kept"><span class="kept" style="width:0%"></span><span class="gone" style="width:100%"></span></div></td></tr>
<tr class="gone"><td><code>com.spun.util.timers.test</code></td><td class="n">1</td><td class="n">1</td><td class="n">0</td><td class="n">23</td><td class="n">0</td><td class="n">0%</td><td><div class="bar" title="0% kept"><span class="kept" style="width:0%"></span><span class="gone" style="width:100%"></span></div></td></tr>
<tr class="partial"><td><code>com.spun.util.velocity</code></td><td class="n">8</td><td class="n">3</td><td class="n">2</td><td class="n">808</td><td class="n">484</td><td class="n">60%</td><td><div class="bar" title="60% kept"><span class="kept" style="width:60%"></span><span class="gone" style="width:40%"></span></div></td></tr>
<tr class="partial"><td><code>org.approvaltests</code></td><td class="n">17</td><td class="n">11</td><td class="n">3</td><td class="n">1,184</td><td class="n">328</td><td class="n">28%</td><td><div class="bar" title="28% kept"><span class="kept" style="width:28%"></span><span class="gone" style="width:72%"></span></div></td></tr>
<tr class="partial"><td><code>org.approvaltests.approvers</code></td><td class="n">3</td><td class="n">0</td><td class="n">2</td><td class="n">142</td><td class="n">129</td><td class="n">91%</td><td><div class="bar" title="91% kept"><span class="kept" style="width:91%"></span><span class="gone" style="width:9%"></span></div></td></tr>
<tr class="gone"><td><code>org.approvaltests.awt</code></td><td class="n">4</td><td class="n">4</td><td class="n">0</td><td class="n">353</td><td class="n">0</td><td class="n">0%</td><td><div class="bar" title="0% kept"><span class="kept" style="width:0%"></span><span class="gone" style="width:100%"></span></div></td></tr>
<tr class="gone"><td><code>org.approvaltests.combinations</code></td><td class="n">4</td><td class="n">4</td><td class="n">0</td><td class="n">889</td><td class="n">0</td><td class="n">0%</td><td><div class="bar" title="0% kept"><span class="kept" style="width:0%"></span><span class="gone" style="width:100%"></span></div></td></tr>
<tr class="gone"><td><code>org.approvaltests.combinations.pairwise</code></td><td class="n">5</td><td class="n">5</td><td class="n">0</td><td class="n">540</td><td class="n">0</td><td class="n">0%</td><td><div class="bar" title="0% kept"><span class="kept" style="width:0%"></span><span class="gone" style="width:100%"></span></div></td></tr>
<tr class="partial"><td><code>org.approvaltests.core</code></td><td class="n">10</td><td class="n">3</td><td class="n">1</td><td class="n">267</td><td class="n">163</td><td class="n">61%</td><td><div class="bar" title="61% kept"><span class="kept" style="width:61%"></span><span class="gone" style="width:39%"></span></div></td></tr>
<tr class="gone"><td><code>org.approvaltests.inline</code></td><td class="n">6</td><td class="n">6</td><td class="n">0</td><td class="n">595</td><td class="n">0</td><td class="n">0%</td><td><div class="bar" title="0% kept"><span class="kept" style="width:0%"></span><span class="gone" style="width:100%"></span></div></td></tr>
<tr class="partial"><td><code>org.approvaltests.integrations.junit5</code></td><td class="n">2</td><td class="n">1</td><td class="n">0</td><td class="n">77</td><td class="n">29</td><td class="n">38%</td><td><div class="bar" title="38% kept"><span class="kept" style="width:38%"></span><span class="gone" style="width:62%"></span></div></td></tr>
<tr class="intact"><td><code>org.approvaltests.internal.logs</code></td><td class="n">3</td><td class="n">0</td><td class="n">0</td><td class="n">113</td><td class="n">113</td><td class="n">100%</td><td><div class="bar" title="100% kept"><span class="kept" style="width:100%"></span><span class="gone" style="width:0%"></span></div></td></tr>
<tr class="gone"><td><code>org.approvaltests.legacycode</code></td><td class="n">1</td><td class="n">1</td><td class="n">0</td><td class="n">37</td><td class="n">0</td><td class="n">0%</td><td><div class="bar" title="0% kept"><span class="kept" style="width:0%"></span><span class="gone" style="width:100%"></span></div></td></tr>
<tr class="partial"><td><code>org.approvaltests.namer</code></td><td class="n">15</td><td class="n">7</td><td class="n">4</td><td class="n">695</td><td class="n">322</td><td class="n">46%</td><td><div class="bar" title="46% kept"><span class="kept" style="width:46%"></span><span class="gone" style="width:54%"></span></div></td></tr>
<tr class="partial"><td><code>org.approvaltests.reporters</code></td><td class="n">43</td><td class="n">24</td><td class="n">4</td><td class="n">1,420</td><td class="n">754</td><td class="n">53%</td><td><div class="bar" title="53% kept"><span class="kept" style="width:53%"></span><span class="gone" style="width:47%"></span></div></td></tr>
<tr class="intact"><td><code>org.approvaltests.reporters.intellij</code></td><td class="n">1</td><td class="n">0</td><td class="n">0</td><td class="n">93</td><td class="n">93</td><td class="n">100%</td><td><div class="bar" title="100% kept"><span class="kept" style="width:100%"></span><span class="gone" style="width:0%"></span></div></td></tr>
<tr class="partial"><td><code>org.approvaltests.reporters.linux</code></td><td class="n">8</td><td class="n">2</td><td class="n">0</td><td class="n">146</td><td class="n">102</td><td class="n">70%</td><td><div class="bar" title="70% kept"><span class="kept" style="width:70%"></span><span class="gone" style="width:30%"></span></div></td></tr>
<tr class="intact"><td><code>org.approvaltests.reporters.macosx</code></td><td class="n">14</td><td class="n">0</td><td class="n">0</td><td class="n">222</td><td class="n">222</td><td class="n">100%</td><td><div class="bar" title="100% kept"><span class="kept" style="width:100%"></span><span class="gone" style="width:0%"></span></div></td></tr>
<tr class="intact"><td><code>org.approvaltests.reporters.windows</code></td><td class="n">14</td><td class="n">0</td><td class="n">0</td><td class="n">222</td><td class="n">222</td><td class="n">100%</td><td><div class="bar" title="100% kept"><span class="kept" style="width:100%"></span><span class="gone" style="width:0%"></span></div></td></tr>
<tr class="partial"><td><code>org.approvaltests.scrubbers</code></td><td class="n">7</td><td class="n">6</td><td class="n">0</td><td class="n">362</td><td class="n">13</td><td class="n">4%</td><td><div class="bar" title="4% kept"><span class="kept" style="width:4%"></span><span class="gone" style="width:96%"></span></div></td></tr>
<tr class="gone"><td><code>org.approvaltests.strings</code></td><td class="n">2</td><td class="n">2</td><td class="n">0</td><td class="n">83</td><td class="n">0</td><td class="n">0%</td><td><div class="bar" title="0% kept"><span class="kept" style="width:0%"></span><span class="gone" style="width:100%"></span></div></td></tr>
<tr class="gone"><td><code>org.approvaltests.testcommitrevert</code></td><td class="n">2</td><td class="n">2</td><td class="n">0</td><td class="n">25</td><td class="n">0</td><td class="n">0%</td><td><div class="bar" title="0% kept"><span class="kept" style="width:0%"></span><span class="gone" style="width:100%"></span></div></td></tr>
<tr class="gone"><td><code>org.approvaltests.utils</code></td><td class="n">3</td><td class="n">3</td><td class="n">0</td><td class="n">132</td><td class="n">0</td><td class="n">0%</td><td><div class="bar" title="0% kept"><span class="kept" style="width:0%"></span><span class="gone" style="width:100%"></span></div></td></tr>
<tr class="gone"><td><code>org.approvaltests.utils.logger</code></td><td class="n">2</td><td class="n">2</td><td class="n">0</td><td class="n">40</td><td class="n">0</td><td class="n">0%</td><td><div class="bar" title="0% kept"><span class="kept" style="width:0%"></span><span class="gone" style="width:100%"></span></div></td></tr>
<tr class="gone"><td><code>org.approvaltests.utils.parseinput</code></td><td class="n">4</td><td class="n">4</td><td class="n">0</td><td class="n">299</td><td class="n">0</td><td class="n">0%</td><td><div class="bar" title="0% kept"><span class="kept" style="width:0%"></span><span class="gone" style="width:100%"></span></div></td></tr>
<tr class="gone"><td><code>org.approvaltests.velocity</code></td><td class="n">1</td><td class="n">1</td><td class="n">0</td><td class="n">45</td><td class="n">0</td><td class="n">0%</td><td><div class="bar" title="0% kept"><span class="kept" style="width:0%"></span><span class="gone" style="width:100%"></span></div></td></tr>
<tr class="partial"><td><code>org.approvaltests.writers</code></td><td class="n">12</td><td class="n">6</td><td class="n">0</td><td class="n">423</td><td class="n">168</td><td class="n">40%</td><td><div class="bar" title="40% kept"><span class="kept" style="width:40%"></span><span class="gone" style="width:60%"></span></div></td></tr>
<tr class="intact"><td><code>org.lambda</code></td><td class="n">1</td><td class="n">0</td><td class="n">0</td><td class="n">6</td><td class="n">6</td><td class="n">100%</td><td><div class="bar" title="100% kept"><span class="kept" style="width:100%"></span><span class="gone" style="width:0%"></span></div></td></tr>
<tr class="partial"><td><code>org.lambda.actions</code></td><td class="n">21</td><td class="n">18</td><td class="n">1</td><td class="n">272</td><td class="n">30</td><td class="n">11%</td><td><div class="bar" title="11% kept"><span class="kept" style="width:11%"></span><span class="gone" style="width:89%"></span></div></td></tr>
<tr class="partial"><td><code>org.lambda.functions</code></td><td class="n">21</td><td class="n">17</td><td class="n">0</td><td class="n">201</td><td class="n">36</td><td class="n">18%</td><td><div class="bar" title="18% kept"><span class="kept" style="width:18%"></span><span class="gone" style="width:82%"></span></div></td></tr>
<tr class="partial"><td><code>org.lambda.query</code></td><td class="n">8</td><td class="n">5</td><td class="n">3</td><td class="n">954</td><td class="n">641</td><td class="n">67%</td><td><div class="bar" title="67% kept"><span class="kept" style="width:67%"></span><span class="gone" style="width:33%"></span></div></td></tr>
<tr class="partial"><td><code>org.lambda.utils</code></td><td class="n">4</td><td class="n">3</td><td class="n">1</td><td class="n">169</td><td class="n">29</td><td class="n">17%</td><td><div class="bar" title="17% kept"><span class="kept" style="width:17%"></span><span class="gone" style="width:83%"></span></div></td></tr>
<tr class="partial"><td><code>org.packagesettings</code></td><td class="n">3</td><td class="n">0</td><td class="n">3</td><td class="n">190</td><td class="n">169</td><td class="n">89%</td><td><div class="bar" title="89% kept"><span class="kept" style="width:89%"></span><span class="gone" style="width:11%"></span></div></td></tr>
</table></div>
<h2>Third-party dependencies</h2>
<div class="scroll"><table>
<tr><th>Package (from imports)</th><th>Status</th></tr>
<tr class="gone"><td><code>com.fasterxml</code></td><td>removed</td></tr>
<tr class="intact"><td><code>com.google</code></td><td>still referenced</td></tr>
<tr class="gone"><td><code>com.sshtools</code></td><td>removed</td></tr>
<tr class="gone"><td><code>com.thoughtworks</code></td><td>removed</td></tr>
<tr class="gone"><td><code>jakarta.mail</code></td><td>removed</td></tr>
<tr class="gone"><td><code>jakarta.servlet</code></td><td>removed</td></tr>
<tr class="gone"><td><code>nu.xom</code></td><td>removed</td></tr>
<tr class="intact"><td><code>org.apache</code></td><td>still referenced</td></tr>
<tr class="intact"><td><code>org.junit</code></td><td>still referenced</td></tr>
<tr class="intact"><td><code>org.packagesettings</code></td><td>still referenced</td></tr>
<tr class="gone"><td><code>org.quartz</code></td><td>removed</td></tr>
<tr class="intact"><td><code>org.slf4j</code></td><td>still referenced</td></tr>
<tr class="gone"><td><code>org.testng</code></td><td>removed</td></tr>
<tr class="gone"><td><code>org.w3c</code></td><td>removed</td></tr>
<tr class="gone"><td><code>org.xml</code></td><td>removed</td></tr>
<tr class="gone"><td><code>tools.jackson</code></td><td>removed</td></tr>
</table></div>
<h2>Changed files (43)</h2>
<div class="muted">Sorted by lines removed. Expand for the diff against the original.</div>
<details><summary><code>com/spun/util/StringUtils.java</code> <span class="muted">712 → 52 lines (-660)</span><div class="bar" title="7% kept"><span class="kept" style="width:7%"></span><span class="gone" style="width:93%"></span></div></summary><pre class="diff"><span class="hunk">@@ -1,22 +1,4 @@</span>
<span class=""> package com.spun.util;</span>
<span class=""> </span>
<span class="del">-import org.lambda.functions.Function1;</span>
<span class="del">-import org.lambda.query.Query;</span>
<span class="del">-import org.lambda.query.Queryable;</span>
<span class="del">-</span>
<span class="del">-import java.io.ByteArrayInputStream;</span>
<span class="del">-import java.io.InputStream;</span>
<span class="del">-import java.io.UnsupportedEncodingException;</span>
<span class="del">-import java.lang.reflect.Field;</span>
<span class="del">-import java.nio.charset.StandardCharsets;</span>
<span class="del">-import java.util.Arrays;</span>
<span class="del">-import java.util.Collection;</span>
<span class="del">-import java.util.Comparator;</span>
<span class="del">-import java.util.List;</span>
<span class="del">-import java.util.Map;</span>
<span class="del">-import java.util.Properties;</span>
<span class="del">-import java.util.SortedMap;</span>
<span class="del">-import java.util.regex.Matcher;</span>
<span class="del">-import java.util.regex.Pattern;</span>
<span class=""> </span>
<span class=""> /**</span>
<span class="hunk">@@ -26,21 +8,4 @@ public class StringUtils</span>
<span class=""> {</span>
<span class=""> public static final String NEW_LINE = System.getProperty("line.separator");</span>
<span class="del">- public static String toURLEncode(String input)</span>
<span class="del">- {</span>
<span class="del">- try</span>
<span class="del">- {</span>
<span class="del">- return input == null ? null : java.net.URLEncoder.encode(input, "UTF-8");</span>
<span class="del">- }</span>
<span class="del">- catch (UnsupportedEncodingException e)</span>
<span class="del">- {</span>
<span class="del">- throw ObjectUtils.throwAsError(e);</span>
<span class="del">- }</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- public static String loadNullableString(String i)</span>
<span class="del">- {</span>
<span class="del">- return StringUtils.isNonZero(i) ? i.trim() : null;</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class=""> /**</span>
<span class=""> * Decode a URLEncoded <code>input</code> String.</span>
<span class="hunk">@@ -52,273 +17,5 @@ public class StringUtils</span>
<span class=""> * @see java.net.URLDecoder</span>
<span class=""> */</span>
<span class="del">- public static String URLDecode(String input)</span>
<span class="del">- {</span>
<span class="del">- try</span>
<span class="del">- {</span>
<span class="del">- return input == null ? null : java.net.URLDecoder.decode(input, "UTF-8");</span>
<span class="del">- }</span>
<span class="del">- catch (Exception e)</span>
<span class="del">- {</span>
<span class="del">- return null;</span>
<span class="del">- }</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- public static String[] split(String string, String splitOn)</span>
<span class="del">- {</span>
<span class="del">- return split(string, splitOn, false);</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- public static String[] split(String string, String splitOn, boolean trim)</span>
<span class="del">- {</span>
<span class="del">- String[] result;</span>
<span class="del">- if (string.endsWith(splitOn))</span>
<span class="del">- {</span>
<span class="del">- String ending = "ś".equals(splitOn) ? "š" : "ś";</span>
<span class="del">- string = string + ending;</span>
<span class="del">- String[] splitted = string.split(splitOn, -1);</span>
<span class="del">- result = ArrayUtils.getSubsection(splitted, 0, splitted.length - 1);</span>
<span class="del">- }</span>
<span class="del">- else</span>
<span class="del">- {</span>
<span class="del">- result = string.split(splitOn);</span>
<span class="del">- }</span>
<span class="del">- return trim ? Query.select(result, a -> a.trim()).asArray() : result;</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- public static String replace(String string, String find, String replace)</span>
<span class="del">- {</span>
<span class="del">- if ((string == null) || (find == null) || (replace == null))</span>
<span class="del">- { throw new NullPointerException(String.format("[string,find,replace] = [%s,%s,%s]", string, find, replace)); }</span>
<span class="del">- String[] parts = split(string, find, false);</span>
<span class="del">- if (parts.length == 1)</span>
<span class="del">- { return string; }</span>
<span class="del">- String result = "";</span>
<span class="del">- for (int i = 0; i < parts.length; i++)</span>
<span class="del">- {</span>
<span class="del">- result += parts[i] + replace;</span>
<span class="del">- }</span>
<span class="del">- return result.substring(0, result.length() - replace.length());</span>
<span class="del">- }</span>
<span class=""> </span>
<span class="del">- public static String stripWhiteSpace(String text)</span>
<span class="del">- {</span>
<span class="del">- return stripWhiteSpace(text, false);</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- public static String padNumber(long number, int digits)</span>
<span class="del">- {</span>
<span class="del">- String text = "" + number;</span>
<span class="del">- while (text.length() < digits)</span>
<span class="del">- {</span>
<span class="del">- text = "0" + text;</span>
<span class="del">- }</span>
<span class="del">- return text;</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- public static String padNumber(int number, int digits)</span>
<span class="del">- {</span>
<span class="del">- return padNumber((long) number, digits);</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- public static String stripWhiteSpace(String text, boolean all)</span>
<span class="del">- {</span>
<span class="del">- StringBuffer newText = new StringBuffer();</span>
<span class="del">- boolean whitespace = false;</span>
<span class="del">- int num = text.length();</span>
<span class="del">- char whiteSpaceChar = ' ';</span>
<span class="del">- boolean atStart = true;</span>
<span class="del">- for (int i = 0; i < num; i++)</span>
<span class="del">- {</span>
<span class="del">- char c = text.charAt(i);</span>
<span class="del">- switch (c)</span>
<span class="del">- {</span>
<span class="del">- case '\r' :</span>
<span class="del">- case '\n' :</span>
<span class="del">- whiteSpaceChar = '\n';</span>
<span class="del">- whitespace = true;</span>
<span class="del">- break;</span>
<span class="del">- case '\t' :</span>
<span class="del">- case ' ' :</span>
<span class="del">- whitespace = true;</span>
<span class="del">- break;</span>
<span class="del">- default :</span>
<span class="del">- if (whitespace && atStart)</span>
<span class="del">- {</span>
<span class="del">- whitespace = false;</span>
<span class="del">- }</span>
<span class="del">- if (whitespace)</span>
<span class="del">- {</span>
<span class="del">- whitespace = false;</span>
<span class="del">- newText.append(all ? '_' : whiteSpaceChar);</span>
<span class="del">- whiteSpaceChar = ' ';</span>
<span class="del">- }</span>
<span class="del">- atStart = false;</span>
<span class="del">- newText.append(c);</span>
<span class="del">- break;</span>
<span class="del">- }</span>
<span class="del">- }</span>
<span class="del">- return newText.toString();</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- /**</span>
<span class="del">- * Turns "mr. frank m Peter" into "Mr. Frank M Peter"</span>
<span class="del">- **/</span>
<span class="del">- public static String toNameUpperCase(String name)</span>
<span class="del">- {</span>
<span class="del">- if (name == null)</span>
<span class="del">- { return null; }</span>
<span class="del">- StringBuffer returning = new StringBuffer(name.length());</span>
<span class="del">- String upper = name.toUpperCase();</span>
<span class="del">- int place = 0;</span>
<span class="del">- while (place < name.length())</span>
<span class="del">- {</span>
<span class="del">- char letter = name.charAt(place);</span>
<span class="del">- if (letter == ' ')</span>
<span class="del">- {</span>
<span class="del">- returning.append(' ');</span>
<span class="del">- if ((place + 1) < name.length())</span>
<span class="del">- {</span>
<span class="del">- returning.append(upper.charAt(++place));</span>
<span class="del">- }</span>
<span class="del">- }</span>
<span class="del">- else if ((place == 0))</span>
<span class="del">- {</span>
<span class="del">- returning.append(upper.charAt(0));</span>
<span class="del">- }</span>
<span class="del">- else</span>
<span class="del">- {</span>
<span class="del">- returning.append(letter);</span>
<span class="del">- }</span>
<span class="del">- place++;</span>
<span class="del">- }</span>
<span class="del">- return returning.toString();</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- public static String toConvertCamelCaseString(String varName, String insertBeforeCaps)</span>
<span class="del">- {</span>
<span class="del">- StringBuffer staticVarName = new StringBuffer();</span>
<span class="del">- for (int i = 0; i < varName.length(); i++)</span>
<span class="del">- {</span>
<span class="del">- char letter = varName.charAt(i);</span>
<span class="del">- if ((i > 0) && (letter == Character.toUpperCase(letter)) && Character.isLetter(letter))</span>
<span class="del">- {</span>
<span class="del">- staticVarName.append(insertBeforeCaps);</span>
<span class="del">- }</span>
<span class="del">- staticVarName.append(letter);</span>
<span class="del">- }</span>
<span class="del">- return staticVarName.toString();</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- /**</span>
<span class="del">- * Turns "ATTRIUBE_NAME" into "AttributeName"</span>
<span class="del">- **/</span>
<span class="del">- public static String toMethodNameCase(String name)</span>
<span class="del">- {</span>
<span class="del">- StringBuffer returning = new StringBuffer(name.length());</span>
<span class="del">- String upper = name.toUpperCase();</span>
<span class="del">- String lower = name.toLowerCase();</span>
<span class="del">- int place = 0;</span>
<span class="del">- while (place < name.length())</span>
<span class="del">- {</span>
<span class="del">- char letter = lower.charAt(place);</span>
<span class="del">- if (letter == ' ' || letter == '_')</span>
<span class="del">- {</span>
<span class="del">- if ((place + 1) < name.length())</span>
<span class="del">- {</span>
<span class="del">- returning.append(upper.charAt(++place));</span>
<span class="del">- }</span>
<span class="del">- }</span>
<span class="del">- else if ((place == 0))</span>
<span class="del">- {</span>
<span class="del">- returning.append(upper.charAt(0));</span>
<span class="del">- }</span>
<span class="del">- else</span>
<span class="del">- {</span>
<span class="del">- returning.append(letter);</span>
<span class="del">- }</span>
<span class="del">- place++;</span>
<span class="del">- }</span>
<span class="del">- return returning.toString();</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- public static String stripNonNumeric(String number)</span>
<span class="del">- {</span>
<span class="del">- return stripNonNumeric(number, false, false);</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- public static String stripCharacters(String dirtyString, String toStrip)</span>
<span class="del">- {</span>
<span class="del">- StringBuffer cleanStringBuffer = new StringBuffer();</span>
<span class="del">- for (int i = 0; i < dirtyString.length(); i++)</span>
<span class="del">- {</span>
<span class="del">- char currentChar = dirtyString.charAt(i);</span>
<span class="del">- if (toStrip.indexOf(currentChar) == -1)</span>
<span class="del">- {</span>
<span class="del">- cleanStringBuffer.append(currentChar);</span>
<span class="del">- }</span>
<span class="del">- }</span>
<span class="del">- return cleanStringBuffer.toString();</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- public static String escapeForXml(String string)</span>
<span class="del">- {</span>
<span class="del">- return string.replaceAll("&", "&amp;");</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- public static String stripNonNumeric(String number, boolean allowDecimal, boolean allowNegative)</span>
<span class="del">- {</span>
<span class="del">- boolean allowExponential = allowDecimal;</span>
<span class="del">- boolean afterE = false;</span>
<span class="del">- if (number == null)</span>
<span class="del">- { return ""; }</span>
<span class="del">- StringBuffer result = new StringBuffer();</span>
<span class="del">- for (int i = 0; i < number.length(); i++)</span>
<span class="del">- {</span>
<span class="del">- char c = number.charAt(i);</span>
<span class="del">- switch (c)</span>
<span class="del">- {</span>
<span class="del">- case '0' :</span>
<span class="del">- case '1' :</span>
<span class="del">- case '2' :</span>
<span class="del">- case '3' :</span>
<span class="del">- case '4' :</span>
<span class="del">- case '5' :</span>
<span class="del">- case '6' :</span>
<span class="del">- case '7' :</span>
<span class="del">- case '8' :</span>
<span class="del">- case '9' :</span>
<span class="del">- result.append(c);</span>
<span class="del">- afterE = false;</span>
<span class="del">- break;</span>
<span class="del">- case '-' :</span>
<span class="del">- if (allowNegative || afterE)</span>
<span class="del">- {</span>
<span class="del">- result.append(c);</span>
<span class="del">- allowNegative = false;</span>
<span class="del">- }</span>
<span class="del">- break;</span>
<span class="del">- case '.' :</span>
<span class="del">- if (allowDecimal)</span>
<span class="del">- {</span>
<span class="del">- result.append(c);</span>
<span class="del">- allowDecimal = false;</span>
<span class="del">- }</span>
<span class="del">- afterE = false;</span>
<span class="del">- break;</span>
<span class="del">- case 'e' :</span>
<span class="del">- case 'E' :</span>
<span class="del">- if (allowExponential)</span>
<span class="del">- {</span>
<span class="del">- result.append(c);</span>
<span class="del">- allowExponential = false;</span>
<span class="del">- }</span>
<span class="del">- afterE = true;</span>
<span class="del">- break;</span>
<span class="del">- default :</span>
<span class="del">- break;</span>
<span class="del">- }</span>
<span class="del">- }</span>
<span class="del">- return result.toString();</span>
<span class="del">- }</span>
<span class=""> </span>
<span class=""> /**</span>
<span class="hunk">@@ -339,362 +36,5 @@ public class StringUtils</span>
<span class=""> }</span>
<span class=""> </span>
<span class="del">- /**</span>
<span class="del">- * A convenience function to turn a vector of String objects into an Array</span>
<span class="del">- * of the String objects.</span>
<span class="del">- *</span>
<span class="del">- * @param vectorOf</span>
<span class="del">- * a Vector of String objects</span>
<span class="del">- * @return the array of String.</span>
<span class="del">- * @throws Error</span>
<span class="del">- * if an element of vectorOf is not a String object.</span>
<span class="del">- **/</span>
<span class="del">- public static String[] toArray(java.util.Collection<String> vectorOf)</span>
<span class="del">- {</span>
<span class="del">- if (vectorOf == null)</span>
<span class="del">- { return new String[0]; }</span>
<span class="del">- String[] array = new String[vectorOf.size()];</span>
<span class="del">- java.util.Iterator<String> iterator = vectorOf.iterator();</span>
<span class="del">- int i = 0;</span>
<span class="del">- while (iterator.hasNext())</span>
<span class="del">- {</span>
<span class="del">- java.lang.Object rowObject = iterator.next();</span>
<span class="del">- if (rowObject instanceof String)</span>
<span class="del">- {</span>
<span class="del">- array[i++] = (String) rowObject;</span>
<span class="del">- }</span>
<span class="del">- else</span>
<span class="del">- {</span>
<span class="del">- throw new Error(</span>
<span class="del">- "toArray[" + i + "] is not an instance of String but a " + ObjectUtils.getClassName(rowObject));</span>
<span class="del">- }</span>
<span class="del">- }</span>
<span class="del">- return array;</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- public static int resolveEnumeration(String value, String[] enumeration)</span>
<span class="del">- {</span>
<span class="del">- return resolveEnumeration(value, enumeration, false);</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- public static int resolveEnumeration(String value, String[] enumeration, boolean force)</span>
<span class="del">- {</span>
<span class="del">- for (int i = 0; i < enumeration.length; i++)</span>
<span class="del">- {</span>
<span class="del">- if (enumeration[i].equals(value))</span>
<span class="del">- { return i; }</span>
<span class="del">- }</span>
<span class="del">- if (force)</span>
<span class="del">- { throw new Error("Enumeration '" + value + "' not in " + Arrays.asList(enumeration).toString()); }</span>
<span class="del">- return -1;</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- public static String truncate(String string, int maxLength)</span>
<span class="del">- {</span>
<span class="del">- if (string == null)</span>
<span class="del">- { return null; }</span>
<span class="del">- return (string.length() <= maxLength) ? string : string.substring(0, maxLength);</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- public static boolean hasNumeric(String teamId)</span>
<span class="del">- {</span>
<span class="del">- return isNonZero(stripNonNumeric(teamId, false, false));</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- public static String toHTMLEncode(String string)</span>
<span class="del">- {</span>
<span class="del">- if (string == null)</span>
<span class="del">- { return null; }</span>
<span class="del">- string = string.replaceAll("<", "&lt;");</span>
<span class="del">- string = string.replaceAll("\n", "<br />");</span>
<span class="del">- return string;</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- public static String toJavaScriptEncode(String string)</span>
<span class="del">- {</span>
<span class="del">- if (string == null)</span>
<span class="del">- { return "null"; }</span>
<span class="del">- string = string.replaceAll("\"", "\\\\\"");</span>
<span class="del">- string = string.replaceAll("\r", "\\\\r");</span>
<span class="del">- string = string.replaceAll("\n", "\\\\n");</span>
<span class="del">- return "\"" + string + "\"";</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- public static boolean isIn(String target, String... fromList)</span>
<span class="del">- {</span>
<span class="del">- return Arrays.asList(fromList).contains(target);</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- public static boolean isIn(String target, String[] fromList, boolean allowNulls)</span>
<span class="del">- {</span>
<span class="del">- return (target == null && allowNulls) ? true : isIn(target, fromList);</span>
<span class="del">- }</span>
<span class=""> </span>
<span class="del">- public static void assertIn(String target, String[] fromList, boolean allowNulls)</span>
<span class="del">- {</span>
<span class="del">- boolean valid = isIn(target, fromList, allowNulls);</span>
<span class="del">- if (!valid)</span>
<span class="del">- { throw new IllegalArgumentException("The value '" + target + "' not in " + Arrays.asList(fromList)); }</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- public static void assertIn(String target, boolean allowNulls, String... options)</span>
<span class="del">- {</span>
<span class="del">- assertIn(target, options, allowNulls);</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- public static String convertEnumeration(final Object forValue, Class<?> clazz)</span>
<span class="del">- {</span>
<span class="del">- Function1<Field, Boolean> filter = a -> {</span>
<span class="del">- try</span>
<span class="del">- {</span>
<span class="del">- return (ClassUtils.IsPublicStatic(a) && a.get(null).equals(forValue));</span>
<span class="del">- }</span>
<span class="del">- catch (Throwable e)</span>
<span class="del">- {</span>
<span class="del">- throw ObjectUtils.throwAsError(e);</span>
<span class="del">- }</span>
<span class="del">- };</span>
<span class="del">- List<Field> fields = Query.where(clazz.getFields(), filter);</span>
<span class="del">- if (fields.isEmpty())</span>
<span class="del">- {</span>
<span class="del">- return "unknown Type " + forValue;</span>
<span class="del">- }</span>
<span class="del">- else</span>
<span class="del">- {</span>
<span class="del">- return fields.get(0).getName();</span>
<span class="del">- }</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- /**</span>
<span class="del">- * 'Tom S Hardy' becomes 'Tom S' - 'Hardy'</span>
<span class="del">- **/</span>
<span class="del">- public static String[] splitName(String fullName)</span>
<span class="del">- {</span>
<span class="del">- String[] names = {null, null};</span>
<span class="del">- int split = fullName.lastIndexOf(' ');</span>
<span class="del">- if (split != -1)</span>
<span class="del">- {</span>
<span class="del">- names[0] = fullName.substring(0, split);</span>
<span class="del">- names[1] = fullName.substring(split);</span>
<span class="del">- }</span>
<span class="del">- else</span>
<span class="del">- {</span>
<span class="del">- names[1] = fullName;</span>
<span class="del">- }</span>
<span class="del">- return names;</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- public static Properties createProperties(String[] properties)</span>
<span class="del">- {</span>
<span class="del">- Properties props = new Properties();</span>
<span class="del">- if (properties == null)</span>
<span class="del">- { return props; }</span>
<span class="del">- if (properties.length % 2 != 0)</span>
<span class="del">- {</span>
<span class="del">- throw new Error(</span>
<span class="del">- "number of strings must be even. found [" + properties.length + "] = " + Arrays.asList(properties));</span>
<span class="del">- }</span>
<span class="del">- for (int i = 0; i < properties.length; i += 2)</span>
<span class="del">- {</span>
<span class="del">- if (properties[i + 1] != null)</span>
<span class="del">- {</span>
<span class="del">- props.setProperty(properties[i], properties[i + 1]);</span>
<span class="del">- }</span>
<span class="del">- else</span>
<span class="del">- {</span>
<span class="del">- props.setProperty(properties[i], "");</span>
<span class="del">- }</span>
<span class="del">- }</span>
<span class="del">- return props;</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- public static <T> String toString(String name, T[] array)</span>
<span class="del">- {</span>
<span class="del">- StringBuffer buffer = new StringBuffer();</span>
<span class="del">- name = (name == null ? "array" : name);</span>
<span class="del">- if (array == null || array.length == 0)</span>
<span class="del">- {</span>
<span class="del">- buffer.append(name + ".length = 0");</span>
<span class="del">- }</span>
<span class="del">- else</span>
<span class="del">- {</span>
<span class="del">- int maxPadding = ("" + array.length).length();</span>
<span class="del">- for (int i = 0; i < array.length; i++)</span>
<span class="del">- {</span>
<span class="del">- buffer.append(name + "[" + padNumber(i, maxPadding) + "] = " + array[i] + "\n");</span>
<span class="del">- }</span>
<span class="del">- }</span>
<span class="del">- return buffer.toString();</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- public static <T> String toString(String name, Iterable<T> array)</span>
<span class="del">- {</span>
<span class="del">- StringBuffer buffer = new StringBuffer();</span>
<span class="del">- name = (name == null ? "array" : name);</span>
<span class="del">- if (array != null)</span>
<span class="del">- {</span>
<span class="del">- int count = 0;</span>
<span class="del">- for (T t : array)</span>
<span class="del">- {</span>
<span class="del">- buffer.append(name + "[" + count + "] = " + arrayStringHelper(t) + "\n");</span>
<span class="del">- count++;</span>
<span class="del">- }</span>
<span class="del">- }</span>
<span class="del">- if (buffer.length() == 0)</span>
<span class="del">- {</span>
<span class="del">- buffer.append(name + ".length = 0");</span>
<span class="del">- }</span>
<span class="del">- return buffer.toString();</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- public static String arrayStringHelper(Object o)</span>
<span class="del">- {</span>
<span class="del">- if (o == null)</span>
<span class="del">- { return "null"; }</span>
<span class="del">- return o.getClass().isArray() ? Arrays.toString((Object[]) o) : o.toString();</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- public static String getFirstName(String fullName)</span>
<span class="del">- {</span>
<span class="del">- return splitName(fullName)[0];</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- public static String getLastName(String fullName)</span>
<span class="del">- {</span>
<span class="del">- return splitName(fullName)[1];</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- public static boolean isLengthWithin(String string, int length)</span>
<span class="del">- {</span>
<span class="del">- return string == null || string.length() <= length;</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- public static boolean equalsIgnoreCase(String one, String two)</span>
<span class="del">- {</span>
<span class="del">- return (one == two || (one != null && one.equalsIgnoreCase(two)));</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- public static StringBuffer trim(StringBuffer buffer, int i)</span>
<span class="del">- {</span>
<span class="del">- if (buffer == null || buffer.length() < i)</span>
<span class="del">- { return buffer; }</span>
<span class="del">- buffer.setLength(buffer.length() - i);</span>
<span class="del">- return buffer;</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- public static String join(String first, String joinBy, String second)</span>
<span class="del">- {</span>
<span class="del">- return isEmpty(second) ? first : first + joinBy + second;</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- public static InputStream convertToInputStream(String string)</span>
<span class="del">- {</span>
<span class="del">- return new ByteArrayInputStream(string.getBytes(StandardCharsets.UTF_8));</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- public static String toString(Map<?, ?> map)</span>
<span class="del">- {</span>
<span class="del">- StringBuffer b = new StringBuffer();</span>
<span class="del">- Object[] keySet = map.keySet().toArray();</span>
<span class="del">- boolean isKeyComparable = ArrayUtils.isEmpty(keySet) || keySet[0] instanceof Comparable;</span>
<span class="del">- if (!(map instanceof SortedMap))</span>
<span class="del">- {</span>
<span class="del">- if (isKeyComparable)</span>
<span class="del">- {</span>
<span class="del">- Arrays.sort(keySet);</span>
<span class="del">- }</span>
<span class="del">- else</span>
<span class="del">- {</span>
<span class="del">- Arrays.sort(keySet, Comparator.comparing(Object::toString));</span>
<span class="del">- }</span>
<span class="del">- }</span>
<span class="del">- for (Object key : keySet)</span>
<span class="del">- {</span>
<span class="del">- b.append(String.format("%s : %s \n", key, map.get(key)));</span>
<span class="del">- }</span>
<span class="del">- return b.toString();</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- public static <T> String join(T[] list, String delimiter, Function1<T, String> convertor)</span>
<span class="del">- {</span>
<span class="del">- return String.join(delimiter, Query.select(list, convertor));</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- public static <T> String join(Collection<T> list, String joinWith)</span>
<span class="del">- {</span>
<span class="del">- return join(list, joinWith, n -> n.toString());</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- public static <T> String join(Collection<T> list, String joinWith, Function1<T, String> converter)</span>
<span class="del">- {</span>
<span class="del">- return String.join(joinWith, Query.select(list, converter));</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- public static String replaceAll(String input, Pattern pattern, Function1<String, String> replacer)</span>
<span class="del">- {</span>
<span class="del">- Matcher matcher = pattern.matcher(input);</span>
<span class="del">- boolean result = matcher.find();</span>
<span class="del">- if (result)</span>
<span class="del">- {</span>
<span class="del">- StringBuilder sb = new StringBuilder();</span>
<span class="del">- int start = 0;</span>
<span class="del">- do</span>
<span class="del">- {</span>
<span class="del">- sb.append(input, start, matcher.start());</span>
<span class="del">- sb.append(replacer.call(matcher.group()));</span>
<span class="del">- start = matcher.end();</span>
<span class="del">- result = matcher.find();</span>
<span class="del">- }</span>
<span class="del">- while (result);</span>
<span class="del">- sb.append(input.substring(start));</span>
<span class="del">- return sb.toString();</span>
<span class="del">- }</span>
<span class="del">- return input;</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- public static String pad(String contents, int targetLength)</span>
<span class="del">- {</span>
<span class="del">- while (contents.length() < targetLength)</span>
<span class="del">- {</span>
<span class="del">- contents += " ";</span>
<span class="del">- if (contents.length() < targetLength)</span>
<span class="del">- {</span>
<span class="del">- contents = " " + contents;</span>
<span class="del">- }</span>
<span class="del">- }</span>
<span class="del">- return contents;</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- public static String padLeft(String contents, int targetLength)</span>
<span class="del">- {</span>
<span class="del">- while (contents.length() < targetLength)</span>
<span class="del">- {</span>
<span class="del">- contents = " " + contents;</span>
<span class="del">- }</span>
<span class="del">- return contents;</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- public static String padRight(String contents, int targetLength)</span>
<span class="del">- {</span>
<span class="del">- while (contents.length() < targetLength)</span>
<span class="del">- {</span>
<span class="del">- contents = contents + " ";</span>
<span class="del">- }</span>
<span class="del">- return contents;</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- public static String removeFromEnd(String contents, String text)</span>
<span class="del">- {</span>
<span class="del">- return removeFromEnd(contents, text.length());</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- public static String removeFromEnd(String contents, int length)</span>
<span class="del">- {</span>
<span class="del">- return contents.substring(0, contents.length() - length);</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- public static String repeat(String string, int times)</span>
<span class="del">- {</span>
<span class="del">- return new String(new char[times]).replace("\0", string);</span>
<span class="del">- }</span>
<span class=""> </span>
<span class=""> public static String ensureEnding(String contents, String desiredEnding)</span>
</pre></details>
<details><summary><code>com/spun/util/ArrayUtils.java</code> <span class="muted">405 → 75 lines (-330)</span><div class="bar" title="19% kept"><span class="kept" style="width:19%"></span><span class="gone" style="width:81%"></span></div></summary><pre class="diff"><span class="hunk">@@ -2,19 +2,11 @@ package com.spun.util;</span>
<span class=""> </span>
<span class=""> import org.lambda.functions.Function0;</span>
<span class="del">-import org.lambda.functions.Function1;</span>
<span class="del">-import org.lambda.query.Queryable;</span>
<span class=""> </span>
<span class="del">-import java.lang.reflect.Array;</span>
<span class="del">-import java.lang.reflect.Method;</span>
<span class=""> import java.util.ArrayList;</span>
<span class=""> import java.util.Arrays;</span>
<span class=""> import java.util.Collection;</span>
<span class=""> import java.util.Collections;</span>
<span class="del">-import java.util.Comparator;</span>
<span class="del">-import java.util.HashMap;</span>
<span class="del">-import java.util.Iterator;</span>
<span class=""> import java.util.List;</span>
<span class=""> import java.util.Map;</span>
<span class="del">-import java.util.Vector;</span>
<span class=""> import java.util.stream.StreamSupport;</span>
<span class=""> </span>
<span class="hunk">@@ -24,20 +16,4 @@ import java.util.stream.StreamSupport;</span>
<span class=""> public class ArrayUtils</span>
<span class=""> {</span>
<span class="del">- public static <T> java.util.Collection<T> addArray(java.util.Collection<T> v, T[] array)</span>
<span class="del">- {</span>
<span class="del">- if ((array == null) || (v == null))</span>
<span class="del">- { return v; }</span>
<span class="del">- for (int i = 0; i < array.length; i++)</span>
<span class="del">- {</span>
<span class="del">- v.add(array[i]);</span>
<span class="del">- }</span>
<span class="del">- return v;</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- public static <T> String toString(T[] values, Function1<T, String> formatter)</span>
<span class="del">- {</span>
<span class="del">- return toString(asList(values), formatter);</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class=""> public static <T> List<T> asList(T[] values)</span>
<span class=""> {</span>
<span class="hunk">@@ -45,59 +21,4 @@ public class ArrayUtils</span>
<span class=""> }</span>
<span class=""> </span>
<span class="del">- public static <T> String toString(Iterable<T> values, Function1<T, String> formatter)</span>
<span class="del">- {</span>
<span class="del">- StringBuffer b = new StringBuffer();</span>
<span class="del">- for (T t : values)</span>
<span class="del">- {</span>
<span class="del">- b.append(formatter.call(t) + "\n");</span>
<span class="del">- }</span>
<span class="del">- return b.toString();</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- /**</span>
<span class="del">- * @deprecated for removal in 16.0.0</span>
<span class="del">- */</span>
<span class="del">- @Deprecated</span>
<span class="del">- public static Vector<Object> toReverseVector(Vector<Object> vector)</span>
<span class="del">- {</span>
<span class="del">- Vector<Object> reverse = new Vector<>(vector.size());</span>
<span class="del">- for (int i = vector.size() - 1; i >= 0; i--)</span>
<span class="del">- {</span>
<span class="del">- reverse.add(vector.elementAt(i));</span>
<span class="del">- }</span>
<span class="del">- return reverse;</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- public static <T> T[] toReverseArray(T[] array)</span>
<span class="del">- {</span>
<span class="del">- for (int i = 0; i < array.length / 2; i++)</span>
<span class="del">- {</span>
<span class="del">- T o1 = array[i];</span>
<span class="del">- int end = array.length - i - 1;</span>
<span class="del">- T o2 = array[end];</span>
<span class="del">- array[i] = o2;</span>
<span class="del">- array[end] = o1;</span>
<span class="del">- }</span>
<span class="del">- return array;</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- public static <T> T[] addToArray(T[] array, T... objects)</span>
<span class="del">- {</span>
<span class="del">- return combine(array, objects);</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- public static <T> T[] getSubsection(T[] array, int startInclusive, int endExclusive)</span>
<span class="del">- {</span>
<span class="del">- int length = endExclusive - startInclusive;</span>
<span class="del">- length = length > array.length ? array.length : length;</span>
<span class="del">- T[] newArray = (T[]) Array.newInstance(array.getClass().getComponentType(), length);</span>
<span class="del">- System.arraycopy(array, startInclusive, newArray, 0, length);</span>
<span class="del">- return newArray;</span>
<span class="del">- }</span>
<span class="del">-</span>
<span class="del">- public static boolean isEmpty(Object[] array)</span>
<span class="del">- {</span>
<span class="del">- return ((array == null) || (array.length == 0));</span>
<span class="del">- }</span>
<span class=""> </span>
<span class=""> public static boolean isEmpty(Iterable<?> collection)</span>
<span class="hunk">@@ -106,206 +27,4 @@ public class ArrayUtils</span>
<span class=""> }</span>
<span class=""> </span>
<span class="del">- public static <T> T getSingleton(T[] parts)</span>
<span class="del">- {</span>
<span class="del">- if (parts == null)</span>
<span class="del">- { return null; }</span>
<span class="del">- switch (parts.length)</span>
<span class="del">- {</span>
<span class="del">- case 0 :</span>
<span class="del">- return null;</span>
<span class="del">- case 1 :</span>
<span class="del">- return parts[0];</span>
<span class="del">- default :</span>
<span class="del">- throw new Error("Called with more than one object in the array " + Arrays.asList(parts));</span>