Skip to content

Commit c4d4c15

Browse files
javadevjavadev
committed
Rename trimLeft, trimRight, padLeft, padRight to the trimStart, trimEnd,
padStart, padLeft in string and lodash plugins.
1 parent f19d9bf commit c4d4c15

File tree

4 files changed

+180
-180
lines changed
  • lodash-plugin/src
  • string-plugin/src

4 files changed

+180
-180
lines changed

‎lodash-plugin/src/main/java/com/github/underscore/lodash/$.java‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* The MIT License (MIT)
33
*
4-
* Copyright 2015 Valentyn Kolesnikov
4+
* Copyright 2016 Valentyn Kolesnikov
55
*
66
* Permission is hereby granted, free of charge, to any person obtaining a copy
77
* of this software and associated documentation files (the "Software"), to deal
@@ -474,20 +474,20 @@ public Chain<String> pad(final int length, final String chars) {
474474
return new Chain<String>($.pad((String) item(), length, chars));
475475
}
476476

477-
public Chain<String> padLeft(final int length) {
478-
return new Chain<String>($.padLeft((String) item(), length));
477+
public Chain<String> padStart(final int length) {
478+
return new Chain<String>($.padStart((String) item(), length));
479479
}
480480

481-
public Chain<String> padLeft(final int length, final String chars) {
482-
return new Chain<String>($.padLeft((String) item(), length, chars));
481+
public Chain<String> padStart(final int length, final String chars) {
482+
return new Chain<String>($.padStart((String) item(), length, chars));
483483
}
484484

485-
public Chain<String> padRight(final int length) {
486-
return new Chain<String>($.padRight((String) item(), length));
485+
public Chain<String> padEnd(final int length) {
486+
return new Chain<String>($.padEnd((String) item(), length));
487487
}
488488

489-
public Chain<String> padRight(final int length, final String chars) {
490-
return new Chain<String>($.padRight((String) item(), length, chars));
489+
public Chain<String> padEnd(final int length, final String chars) {
490+
return new Chain<String>($.padEnd((String) item(), length, chars));
491491
}
492492

493493
public Chain<String> snakeCase() {
@@ -514,16 +514,16 @@ public Chain<String> trim(final String chars) {
514514
return new Chain<String>($.trim((String) item(), chars));
515515
}
516516

517-
public Chain<String> trimLeft() {
518-
return new Chain<String>($.trimLeft((String) item()));
517+
public Chain<String> trimStart() {
518+
return new Chain<String>($.trimStart((String) item()));
519519
}
520520

521-
public Chain<String> trimLeft(final String chars) {
522-
return new Chain<String>($.trimLeft((String) item(), chars));
521+
public Chain<String> trimStart(final String chars) {
522+
return new Chain<String>($.trimStart((String) item(), chars));
523523
}
524524

525-
public Chain<String> trimRight() {
526-
return new Chain<String>($.trimRight((String) item()));
525+
public Chain<String> trimEnd() {
526+
return new Chain<String>($.trimEnd((String) item()));
527527
}
528528

529529
public Chain<String> trunc() {
@@ -534,8 +534,8 @@ public Chain<String> trunc(final int length) {
534534
return new Chain<String>($.trunc((String) item(), length));
535535
}
536536

537-
public Chain<String> trimRight(final String chars) {
538-
return new Chain<String>($.trimRight((String) item(), chars));
537+
public Chain<String> trimEnd(final String chars) {
538+
return new Chain<String>($.trimEnd((String) item(), chars));
539539
}
540540

541541
public Chain<String> uncapitalize() {
@@ -1071,19 +1071,19 @@ public String apply(String string, Integer length, String chars) {
10711071
};
10721072
}
10731073

1074-
public static String padLeft(final String string, final Integer length) {
1074+
public static String padStart(final String string, final Integer length) {
10751075
return createPadDir(false).apply(string, length, null);
10761076
}
10771077

1078-
public static String padLeft(final String string, final Integer length, final String chars) {
1078+
public static String padStart(final String string, final Integer length, final String chars) {
10791079
return createPadDir(false).apply(string, length, chars);
10801080
}
10811081

1082-
public static String padRight(final String string, final Integer length) {
1082+
public static String padEnd(final String string, final Integer length) {
10831083
return createPadDir(true).apply(string, length, null);
10841084
}
10851085

1086-
public static String padRight(final String string, final Integer length, final String chars) {
1086+
public static String padEnd(final String string, final Integer length, final String chars) {
10871087
return createPadDir(true).apply(string, length, chars);
10881088
}
10891089

@@ -1158,11 +1158,11 @@ public static String trim(final String string, final String chars) {
11581158
return leftIndex > -1 ? localString.substring(leftIndex, rightIndex + 1) : localString;
11591159
}
11601160

1161-
public static String trimLeft(final String string) {
1162-
return trimLeft(string, null);
1161+
public static String trimStart(final String string) {
1162+
return trimStart(string, null);
11631163
}
11641164

1165-
public static String trimLeft(final String string, final String chars) {
1165+
public static String trimStart(final String string, final String chars) {
11661166
final String localString = baseToString(string);
11671167
if (localString.isEmpty()) {
11681168
return localString;
@@ -1177,11 +1177,11 @@ public static String trimLeft(final String string, final String chars) {
11771177
return leftIndex > -1 ? localString.substring(leftIndex, localString.length()) : localString;
11781178
}
11791179

1180-
public static String trimRight(final String string) {
1181-
return trimRight(string, null);
1180+
public static String trimEnd(final String string) {
1181+
return trimEnd(string, null);
11821182
}
11831183

1184-
public static String trimRight(final String string, final String chars) {
1184+
public static String trimEnd(final String string, final String chars) {
11851185
final String localString = baseToString(string);
11861186
if (localString.isEmpty()) {
11871187
return localString;
@@ -2469,20 +2469,20 @@ public String pad(final int length, final String chars) {
24692469
return pad(getString().get(), length, chars);
24702470
}
24712471

2472-
public String padLeft(final int length) {
2473-
return padLeft(getString().get(), length);
2472+
public String padStart(final int length) {
2473+
return padStart(getString().get(), length);
24742474
}
24752475

2476-
public String padLeft(final int length, final String chars) {
2477-
return padLeft(getString().get(), length, chars);
2476+
public String padStart(final int length, final String chars) {
2477+
return padStart(getString().get(), length, chars);
24782478
}
24792479

2480-
public String padRight(final int length) {
2481-
return padRight(getString().get(), length);
2480+
public String padEnd(final int length) {
2481+
return padEnd(getString().get(), length);
24822482
}
24832483

2484-
public String padRight(final int length, final String chars) {
2485-
return padRight(getString().get(), length, chars);
2484+
public String padEnd(final int length, final String chars) {
2485+
return padEnd(getString().get(), length, chars);
24862486
}
24872487

24882488
public String snakeCase() {
@@ -2509,20 +2509,20 @@ public String trimWith(final String chars) {
25092509
return trim(getString().get(), chars);
25102510
}
25112511

2512-
public String trimLeft() {
2513-
return trimLeft(getString().get());
2512+
public String trimStart() {
2513+
return trimStart(getString().get());
25142514
}
25152515

2516-
public String trimLeftWith(final String chars) {
2517-
return trimLeft(getString().get(), chars);
2516+
public String trimStartWith(final String chars) {
2517+
return trimStart(getString().get(), chars);
25182518
}
25192519

2520-
public String trimRight() {
2521-
return trimRight(getString().get());
2520+
public String trimEnd() {
2521+
return trimEnd(getString().get());
25222522
}
25232523

2524-
public String trimRightWith(final String chars) {
2525-
return trimRight(getString().get(), chars);
2524+
public String trimEndWith(final String chars) {
2525+
return trimEnd(getString().get(), chars);
25262526
}
25272527

25282528
public String trunc() {

‎lodash-plugin/src/test/java/com/github/underscore/lodash/StringTest.java‎

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* The MIT License (MIT)
33
*
4-
* Copyright 2015 Valentyn Kolesnikov
4+
* Copyright 2016 Valentyn Kolesnikov
55
*
66
* Permission is hereby granted, free of charge, to any person obtaining a copy
77
* of this software and associated documentation files (the "Software"), to deal
@@ -268,45 +268,45 @@ public void trim() {
268268
}
269269

270270
/*
271-
_.trimLeft(' abc ');
271+
_.trimStart(' abc ');
272272
=> 'abc '
273273
274-
_.trimLeft('-_-abc-_-', '_-');
274+
_.trimStart('-_-abc-_-', '_-');
275275
=> 'abc-_-'
276276
*/
277277

278278
@Test
279-
public void trimLeft() {
280-
assertEquals("abc ", $.trimLeft(" abc "));
281-
assertEquals("abc ", new $(" abc ").trimLeft());
282-
assertEquals("abc ", $.chain(" abc ").trimLeft().item());
283-
assertEquals("", $.trimLeft(""));
284-
assertEquals(" ", $.trimLeft(" ", ""));
285-
assertEquals("abc-_-", $.trimLeft("-_-abc-_-", "_-"));
286-
assertEquals("abc-_-", new $("-_-abc-_-").trimLeftWith("_-"));
287-
assertEquals("abc-_-", $.chain("-_-abc-_-").trimLeft("_-").item());
288-
assertEquals(" ", $.trimLeft(" ", " "));
279+
public void trimStart() {
280+
assertEquals("abc ", $.trimStart(" abc "));
281+
assertEquals("abc ", new $(" abc ").trimStart());
282+
assertEquals("abc ", $.chain(" abc ").trimStart().item());
283+
assertEquals("", $.trimStart(""));
284+
assertEquals(" ", $.trimStart(" ", ""));
285+
assertEquals("abc-_-", $.trimStart("-_-abc-_-", "_-"));
286+
assertEquals("abc-_-", new $("-_-abc-_-").trimStartWith("_-"));
287+
assertEquals("abc-_-", $.chain("-_-abc-_-").trimStart("_-").item());
288+
assertEquals(" ", $.trimStart(" ", " "));
289289
}
290290

291291
/*
292-
_.trimRight(' abc ');
292+
_.trimEnd(' abc ');
293293
=> ' abc'
294294
295-
_.trimRight('-_-abc-_-', '_-');
295+
_.trimEnd('-_-abc-_-', '_-');
296296
=> '-_-abc'
297297
*/
298298

299299
@Test
300-
public void trimRight() {
301-
assertEquals(" abc", $.trimRight(" abc "));
302-
assertEquals(" abc", new $(" abc ").trimRight());
303-
assertEquals(" abc", $.chain(" abc ").trimRight().item());
304-
assertEquals("", $.trimRight(""));
305-
assertEquals(" ", $.trimRight(" ", ""));
306-
assertEquals("-_-abc", $.trimRight("-_-abc-_-", "_-"));
307-
assertEquals("-_-abc", new $("-_-abc-_-").trimRightWith("_-"));
308-
assertEquals("-_-abc", $.chain("-_-abc-_-").trimRight("_-").item());
309-
assertEquals(" ", $.trimRight(" ", " "));
300+
public void trimEnd() {
301+
assertEquals(" abc", $.trimEnd(" abc "));
302+
assertEquals(" abc", new $(" abc ").trimEnd());
303+
assertEquals(" abc", $.chain(" abc ").trimEnd().item());
304+
assertEquals("", $.trimEnd(""));
305+
assertEquals(" ", $.trimEnd(" ", ""));
306+
assertEquals("-_-abc", $.trimEnd("-_-abc-_-", "_-"));
307+
assertEquals("-_-abc", new $("-_-abc-_-").trimEndWith("_-"));
308+
assertEquals("-_-abc", $.chain("-_-abc-_-").trimEnd("_-").item());
309+
assertEquals(" ", $.trimEnd(" ", " "));
310310
}
311311

312312
/*
@@ -366,45 +366,45 @@ public void pad() {
366366
}
367367

368368
/*
369-
_.padLeft('abc', 6);
369+
_.padStart('abc', 6);
370370
=> ' abc'
371371
372-
_.padLeft('abc', 6, '_-');
372+
_.padStart('abc', 6, '_-');
373373
=> '_-_abc'
374374
375-
_.padLeft('abc', 3);
375+
_.padStart('abc', 3);
376376
=> 'abc'
377377
*/
378378
@Test
379-
public void padLeft() {
380-
assertEquals(" abc", $.padLeft("abc", 6));
381-
assertEquals(" abc", new $("abc").padLeft(6));
382-
assertEquals(" abc", $.chain("abc").padLeft(6).item());
383-
assertEquals("_-_abc", $.padLeft("abc", 6, "_-"));
384-
assertEquals("_-_abc", new $("abc").padLeft(6, "_-"));
385-
assertEquals("_-_abc", $.chain("abc").padLeft(6, "_-").item());
386-
assertEquals("abc", $.padLeft("abc", 3));
379+
public void padStart() {
380+
assertEquals(" abc", $.padStart("abc", 6));
381+
assertEquals(" abc", new $("abc").padStart(6));
382+
assertEquals(" abc", $.chain("abc").padStart(6).item());
383+
assertEquals("_-_abc", $.padStart("abc", 6, "_-"));
384+
assertEquals("_-_abc", new $("abc").padStart(6, "_-"));
385+
assertEquals("_-_abc", $.chain("abc").padStart(6, "_-").item());
386+
assertEquals("abc", $.padStart("abc", 3));
387387
}
388388

389389
/*
390-
_.padRight('abc', 6);
390+
_.padEnd('abc', 6);
391391
// → 'abc '
392392
393-
_.padRight('abc', 6, '_-');
393+
_.padEnd('abc', 6, '_-');
394394
// → 'abc_-_'
395395
396-
_.padRight('abc', 3);
396+
_.padEnd('abc', 3);
397397
// → 'abc'
398398
*/
399399
@Test
400-
public void padRight() {
401-
assertEquals("abc ", $.padRight("abc", 6));
402-
assertEquals("abc ", new $("abc").padRight(6));
403-
assertEquals("abc ", $.chain("abc").padRight(6).item());
404-
assertEquals("abc_-_", $.padRight("abc", 6, "_-"));
405-
assertEquals("abc_-_", new $("abc").padRight(6, "_-"));
406-
assertEquals("abc_-_", $.chain("abc").padRight(6, "_-").item());
407-
assertEquals("abc", $.padRight("abc", 3));
400+
public void padEnd() {
401+
assertEquals("abc ", $.padEnd("abc", 6));
402+
assertEquals("abc ", new $("abc").padEnd(6));
403+
assertEquals("abc ", $.chain("abc").padEnd(6).item());
404+
assertEquals("abc_-_", $.padEnd("abc", 6, "_-"));
405+
assertEquals("abc_-_", new $("abc").padEnd(6, "_-"));
406+
assertEquals("abc_-_", $.chain("abc").padEnd(6, "_-").item());
407+
assertEquals("abc", $.padEnd("abc", 3));
408408
}
409409

410410
/*

0 commit comments

Comments
 (0)