From 940be1962308c030eb6a64bd38a3e9df29692bef Mon Sep 17 00:00:00 2001
From: binsky <timo@binsky.org>
Date: Wed, 24 Nov 2021 11:01:08 +0100
Subject: [PATCH] refactor implementation for the roll after spare counts twice
 test

---
 src/main/java/BowlingGameCalculator.java   |  19 ++++++++++++++++---
 target/classes/BowlingGameCalculator.class | Bin 1253 -> 2583 bytes
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/main/java/BowlingGameCalculator.java b/src/main/java/BowlingGameCalculator.java
index 8ea8bd1..1fda65b 100644
--- a/src/main/java/BowlingGameCalculator.java
+++ b/src/main/java/BowlingGameCalculator.java
@@ -1,3 +1,4 @@
+import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -10,16 +11,28 @@ public class BowlingGameCalculator {
     public int score(String playerResult) {
         int playerScore = INITIAL_SCORE_VALUE;
 
+        /*
         Matcher singleDigit = SINGLE_VALUE_PATTERN.matcher(playerResult);
         while (singleDigit.find()) {
             playerScore += Integer.parseInt(singleDigit.group());
         }
 
         Matcher spare = SPARE_PATTERN.matcher(playerResult);
-        while (spare.find()) {
-            playerScore += 10 + Integer.parseInt(spare.group(1));
-        }
+        Function<Matcher, Integer> spareScorer = (spareMatcher) -> 10 + Integer.parseInt(spare.group(1));
+        playerScore = scoreMatch(playerScore, spare, spareScorer);
+        */
+
+        playerScore += scoreMatch(SINGLE_VALUE_PATTERN.matcher(playerResult), (spareMatcher) -> Integer.parseInt(spareMatcher.group()));
+        playerScore += scoreMatch(SPARE_PATTERN.matcher(playerResult), (spareMatcher) -> 10 + Integer.parseInt(spareMatcher.group(1)));
 
         return playerScore;
     }
+
+    private int scoreMatch(Matcher scoreMatch, Function<Matcher, Integer> scorer) {
+        int playerScore = INITIAL_SCORE_VALUE;
+        while (scoreMatch.find()) {
+            playerScore += scorer.apply(scoreMatch);
+        }
+        return playerScore;
+    }
 }
diff --git a/target/classes/BowlingGameCalculator.class b/target/classes/BowlingGameCalculator.class
index e06f1b25c447aefc91fb5e08799630fd35bd51b1..649e59fadff4f972234c4cd71fbcfeb33ebd7283 100644
GIT binary patch
literal 2583
zcmbVOZC4vb6n-WN1j14v1uCxvq%{dIX|1(lC<+m1Y<Q7S)E0zcvxJ4sZo0dn<!AWO
zU*H!%SUm@^A3T2c_(%K?9`(-b29`t0QBTg<nVq@!dG0*--r4;2*Xv&Ze2C*1LI_6@
zQP6-!hV}z~#M1^hOX-!}15I@q8mDzrcV`&FiR4BUO$=Rg)(b;7ON+d$Wx1hN4enZY
zGopwoXo14eS;#Ff=I6IJX7f+xw^wJ^*XP%k8G7;(zUt~m+SW?i%k(ODUClN#F<e7i
z6zvK+5NEjY20MmmnY-$~W;5JNcxW=%>^`>(+ViSrs#+#_iDt=j%Eal=oeH|p&CtLr
z72}xUW+G_6S2a~vx6Jf{KcUc~cuPSKdKqGlYT24ZW0>*-2pp%z6A0ikU@|A9>Q^uz
zq-rg!&aRzl6bFeH!w`m}7*X&xM(c>-voJ*Vbh9WE^RxxG@lF&8akwNy-?@O70${iu
zl+Md@O|(GjGf|8&beva2&U7hhb_^*@D40Z=p-DI04Q^C58AVP+epkV}xJUYyY^z$K
zYDwgLfhBgqwW)MS)fDb4cpnc4q{3}SBXnULNUCp|B-j+D6e`yY6~K|8TiIjiz6k6`
zN615XC}N<J?X2ZCNZo{w8A6*yQFC(&viO8hRjXXl4LZg|y$AyNyjZtQSYT*LKO34D
z-%2GmizNN^+;VO`H=ExsWLGG$vIQ7ej#8bqOvmNEVqvO9%624c6^XVjubbL(wY;m@
z>wH%P63<&IH#WGfi+6u9;_mAXl|;U73z9qyvO*b@iouUHdrfny2I(5VEGxzB*%U-g
z*K5vNHPam+QK{($0!myeETZqe81!+a7Wm_<9H#@Dp1w8eK-jhX&Jay&!R6}V60i8O
zG#B)e$=#|rN9q5y<$sJJN%_2H@bYevk4kYy?=nojnL5}4wUbbm94dY9J`q>iMZi1M
z8Ph6VwDR_i6|AbQY74SRd+VluQnV`F;d7SdI<CztOPafH6`i(5Xff=e6ve&*9R~~}
z=UuIvN7kX1&dalq2jAl=UFUQ&wv>Z!zXuz`ck&1xakFS>&S>7U4y%<+AZLCD2UadP
zu2X#k&Hw$TM|rhxP;wuczE(y-cePAAlB7ym-0h}<ZEUq;ix!@X1zW);wkSC{)70#&
z!5v3)qNp<5x};h?0it-pFnF~owUnn8hKVsmH$fP^;@e5HUh!d&<02l>4UwaH2%n;n
z=Jb)K=VMw))5vISNc{x%N}A;9DYj`5OY~Iy`7&1MjbRlJ=qa3CM2HYbg&+2(en9is
z30hy{I&gv;J94SdTN<n_eMi<I2!=TM3hWSl61yna1o|c0kcSA5jj-_<)`%}e76m#;
zNP6_rQ$+AJSqq%O@C-5C{07|v<6}SLRtUc$b%ODonQ#C8V?eM*0<1&iJ&b0I5a+05
zO?fD1tb-KQx;*zFo?t_=_DlXSK9_L|eZ<}uwD%>=N&Y_(Vm)|DFCjc@kBRjALQPSa
z!lA7_mWrI<&MDs8ImHLxOVe|`djop6;VX&&1Vd%z!`!D)z_ifOrU|1CL{9*s#e+Z-
zcFyuWApwAn_(!Lh{SnRac{%op+%u_>_%A2U(?q{8xQuZZDvjN=Q>3*+7_j_Vg=P-z
M#mL*m5niI_AE4KT6951J

delta 627
zcmYLGOHUI~7(I6$PCK32(g$_w2-+%bMXV1%c~q^?1qn6;x*{ez$~dVur76`df53%g
z7REoI8#iJ?2n*tp_&;2@(Ldnp+`)v+J>R|Gne(0R%-hVjsQLBJ!6ATIG<M7%NfQ}l
z4Gdez;fz2o*wJ!D0qt44yCI;KE9;Vxw{RAYfbRD<U-kqt<zQ3Ej*ei|z<CQ7P!Je;
z?!I!X9k=UOm%0Pb_xizWrPz$Zz(os}U<t(6R_d#bM=SMKtFhXY!X+tO7RZ*DD$6GV
zYlD8f>(51SSwMNXVd6BdSeU@oAfe8SYr(R5l!$GS((xACetRHb2X8c+3+P)tx9`bO
z1NZ5R2X3$BKIwSDdwpt}HVr6TT}2)-Sgi8WSBTef0|GZ$E0`pMN;t)HD)?dyZ%^}G
z-T)1^cv@kt<2Gh^6AZH;xvY=K(1{CbZ5Pq;J;a+6dq}@S(jnUWIQO{r;qT8~6lHH#
zv$e3Bb&{s7u^y8QN%`)4q>KtVdb@xKAx3X;$S{VGzz9+(A&n|ytn=?lUz5kP|NEi~
z%we9+6f$buP~q1zxP!YCF2TV)RvLStqV^l6Fpx?ALWE#*<o)9axE`~Y+mn~7>|^{h
aqN!?##ZP<`p-YqUGNuS)791_3T>J<4ePERU