From d4c85aac533feda7767d6b061519f45fd4cc6719 Mon Sep 17 00:00:00 2001 From: Chris Norman Date: Tue, 31 Jan 2023 12:02:57 -0500 Subject: [PATCH] Upgrade to Java 17 and gradle 7.4.2. (#188) * Upgrade to Java 17 and gradle 7.4.2; use new doclet APIs; remove mock unit tests, fix custom tags. --- .travis.yml | 3 +- build.gradle | 143 +++--- gradle/wrapper/gradle-wrapper.jar | Bin 52928 -> 59821 bytes gradle/wrapper/gradle-wrapper.properties | 3 +- gradlew | 287 ++++++----- .../barclay/argparser/ArgumentDefinition.java | 2 +- .../argparser/CommandLinePluginProvider.java | 1 - .../LegacyCommandLineArgumentParser.java | 2 +- .../barclay/help/BarclayDocletOption.java | 74 +++ .../barclay/help/BarclayDocletOptions.java | 22 + .../barclay/help/BashTabCompletionDoclet.java | 422 ++++++++-------- .../help/DefaultDocWorkUnitHandler.java | 259 +++++----- .../barclay/help/DocWorkUnit.java | 79 ++- .../barclay/help/DocletUtils.java | 72 ++- .../barclay/help/HelpDoclet.java | 453 ++++++++---------- .../barclay/help/WDLDoclet.java | 37 +- .../barclay/help/scanners/CommentScanner.java | 51 ++ .../scanners/CommentScannerWithTagFilter.java | 57 +++ .../scanners/DocumentedFeatureScanner.java | 73 +++ .../barclay/help/scanners/FieldScanner.java | 60 +++ .../scanners/JavaLanguageModelScanners.java | 145 ++++++ .../scanners/UnknownInlineTagScanner.java | 61 +++ .../barclay/utils/JVMUtils.java | 23 - .../CollectionArgumentUnitTests.java | 24 +- .../argparser/CommandLinePluginUnitTest.java | 18 +- .../NamedArgumentDefinitionUnitTest.java | 4 +- .../DefaultDocWorkUnitHandlerUnitTest.java | 113 ----- .../barclay/help/DocGenMocks.java | 43 -- .../barclay/help/DocWorkUnitTest.java | 110 ----- ...ocumentationGenerationIntegrationTest.java | 47 +- .../barclay/help/testdoclets/TestDoclet.java | 28 +- .../testinputs/TestArgumentContainer.java | 3 + .../help/testinputs/TestNonCLPEnum.java | 13 + ...abCompletionDocletTestLaunch-completion.sh | 10 +- ...DocletTestLaunchWithDefaults-completion.sh | 10 +- ...help_testinputs_TestArgumentContainer.html | 33 +- ...help_testinputs_TestArgumentContainer.json | 27 +- ...help_testinputs_TestArgumentContainer.html | 32 +- ...help_testinputs_TestArgumentContainer.json | 27 +- ...help_testinputs_TestArgumentContainer.json | 1 + ..._help_testinputs_TestArgumentContainer.wdl | 7 + 41 files changed, 1696 insertions(+), 1183 deletions(-) create mode 100644 src/main/java/org/broadinstitute/barclay/help/BarclayDocletOption.java create mode 100644 src/main/java/org/broadinstitute/barclay/help/BarclayDocletOptions.java create mode 100644 src/main/java/org/broadinstitute/barclay/help/scanners/CommentScanner.java create mode 100644 src/main/java/org/broadinstitute/barclay/help/scanners/CommentScannerWithTagFilter.java create mode 100644 src/main/java/org/broadinstitute/barclay/help/scanners/DocumentedFeatureScanner.java create mode 100644 src/main/java/org/broadinstitute/barclay/help/scanners/FieldScanner.java create mode 100644 src/main/java/org/broadinstitute/barclay/help/scanners/JavaLanguageModelScanners.java create mode 100644 src/main/java/org/broadinstitute/barclay/help/scanners/UnknownInlineTagScanner.java delete mode 100644 src/test/java/org/broadinstitute/barclay/help/DefaultDocWorkUnitHandlerUnitTest.java delete mode 100644 src/test/java/org/broadinstitute/barclay/help/DocGenMocks.java delete mode 100644 src/test/java/org/broadinstitute/barclay/help/DocWorkUnitTest.java create mode 100644 src/test/java/org/broadinstitute/barclay/help/testinputs/TestNonCLPEnum.java diff --git a/.travis.yml b/.travis.yml index db9527c0..a65d23cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,8 +9,7 @@ cache: - $HOME/.gradle/wrapper/ - $HOME/.m2 jdk: -- oraclejdk8 -- openjdk8 + - openjdk17 script: ./gradlew jacocoTestReport ; after_success: - echo "TRAVIS_BRANCH='$TRAVIS_BRANCH'"; echo "JAVA_HOME='$JAVA_HOME'"; diff --git a/build.gradle b/build.gradle index d0acca3a..e25dfb7f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,15 +1,17 @@ -import javax.tools.ToolProvider - plugins { id "java" - id 'maven' + id 'maven-publish' id 'signing' id 'jacoco' id 'com.palantir.git-version' version '0.5.1' //version helper } -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +wrapper { + gradleVersion = '7.4.2' +} + +sourceCompatibility = 1.17 +targetCompatibility = 1.17 group = 'org.broadinstitute' @@ -26,14 +28,15 @@ repositories { } jacocoTestReport { + getAdditionalSourceDirs().from(sourceSets.main.allJava.srcDirs) + dependsOn test group = "Reporting" description = "Generate Jacoco coverage reports after running tests." - additionalSourceDirs = files(sourceSets.main.allJava.srcDirs) reports { - xml.enabled = true // codecov plugin depends on xml format report - html.enabled = true + xml.required = true // codecov plugin depends on xml format report + html.required = true } } @@ -44,22 +47,16 @@ compileTestJava { options.compilerArgs = ['-proc:none', '-Xlint:all','-Werror','-Xdiags:verbose'] } dependencies { - compile 'net.sf.jopt-simple:jopt-simple:5.0.3' - compile 'org.apache.commons:commons-lang3:3.4' - compile 'org.apache.logging.log4j:log4j-api:2.17.1' - compile 'org.apache.logging.log4j:log4j-core:2.15.0' - - // Get the jdk files we need to run javaDoc. We need to use these during compile, testCompile, - // test execution, and gatkDoc generation, but we don't want them as part of the runtime - // classpath and we don't want to redistribute them in the uber jar. - final javadocJDKFiles = files(((URLClassLoader) ToolProvider.getSystemToolClassLoader()).getURLs()) - compileOnly(javadocJDKFiles) - testCompile(javadocJDKFiles) - compile 'org.freemarker:freemarker:2.3.30' - compile 'com.google.code.gson:gson:2.2.2' - - testCompile 'org.testng:testng:6.9.6' - testCompile 'org.mockito:mockito-core:2.10.0' + implementation 'net.sf.jopt-simple:jopt-simple:5.0.3' + implementation 'org.apache.commons:commons-lang3:3.4' + implementation 'org.apache.logging.log4j:log4j-api:2.17.1' + implementation 'org.apache.logging.log4j:log4j-core:2.15.0' + implementation 'org.freemarker:freemarker:2.3.30' + implementation 'com.google.code.gson:gson:2.2.2' + + testImplementation 'commons-io:commons-io:2.11.0' + testImplementation 'org.testng:testng:6.9.6' + testImplementation 'org.mockito:mockito-core:4.6.1' } test { @@ -92,16 +89,16 @@ test { } task javadocJar(type: Jar, dependsOn: javadoc) { - classifier = 'javadoc' + archiveClassifier = 'javadoc' from 'build/docs/javadoc' } task sourcesJar(type: Jar) { from sourceSets.main.allSource - classifier = 'sources' + archiveClassifier = 'sources' } -// This is a hack to disable the java 8 default javadoc lint until we fix the html formatting +// This is a hack to disable the default javadoc lint until we fix the html formatting tasks.withType(Javadoc) { options.addStringOption('Xdoclint:none', '-quiet') } @@ -119,8 +116,36 @@ artifacts { * Sign non-snapshot releases with our secret key. This should never need to be invoked directly. */ signing { - required { isRelease && gradle.taskGraph.hasTask("uploadArchives") } - sign configurations.archives + required { isRelease && gradle.taskGraph.hasTask("publish") } + sign publishing.publications +} + +def basePomConfiguration = { + packaging = 'jar' + description = 'Barclay command line parsing and documentation utilities' + url = 'http://github.com/broadinstitute/barclay' + + developers { + developer { + id = 'gatkdev' + name = 'GATK Development Team' + email = 'gatk-dev-public@broadinstitute.org' + } + } + + scm { + url 'scm:git@github.com:broadinstitute/barclay.git' + connection 'scm:git@github.com:broadinstitute/barclay.git' + developerConnection 'scm:git@github.com:broadinstitute/barclay.git' + } + + licenses { + license { + name = 'BSD 3-Clause' + url = 'https://github.com/broadinstitute/barclay/blob/master/LICENSE.TXT' + distribution = 'repo' + } + } } /** @@ -129,51 +154,29 @@ signing { * * For releasing to your local maven repo, use gradle install */ -uploadArchives { - doFirst { - println "Attempting to upload version:$version" +publishing { + publications { + barclay(MavenPublication) { + from components.java + artifactId = "barclay" + pom { basePomConfiguration} + pom.name = "Barclay" + + artifact javadocJar + artifact sourcesJar + } } - repositories { - mavenDeployer { - beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) } - repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") { - authentication(userName: project.findProperty("sonatypeUsername"), password: project.findProperty("sonatypePassword")) - } - - snapshotRepository(url: "https://broadinstitute.jfrog.io/broadinstitute/libs-snapshot-local/") { - authentication(userName: System.env.ARTIFACTORY_USERNAME, password: System.env.ARTIFACTORY_PASSWORD) - } - - pom.project { - name 'Barclay' - packaging 'jar' - description 'Development on Barclay command line parsing and documentation utilities' - url 'http://github.com/broadinstitute/barclay' - - scm { - url 'scm:git@github.com:broadinstitute/barclay.git' - connection 'scm:git@github.com:broadinstitute/barclay.git' - developerConnection 'scm:git@github.com:broadinstitute/barclay.git' - } - - developers { - developer { - id = "gatkdev" - name = "GATK Development Team" - email = "gatk-dev-public@broadinstitute.org" - } - } - - licenses { - license { - name 'BSD 3-Clause' - url 'https://github.com/broadinstitute/barclay/blob/master/LICENSE.TXT' - distribution 'repo' - } - } + repositories { + maven { + name = isRelease ? "SonaType" : "Artifactory" + url = isRelease ? "https://oss.sonatype.org/service/local/staging/deploy/maven2/" : "https://broadinstitute.jfrog.io/broadinstitute/libs-snapshot-local/" + credentials { + username = isRelease ? project.findProperty("sonatypeUsername") : System.env.ARTIFACTORY_USERNAME + password = isRelease ? project.findProperty("sonatypePassword") : System.env.ARTIFACTORY_PASSWORD } } } } + diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 6ffa237849ef3607e39c3b334a92a65367962071..41d9927a4d4fb3f96a785543079b8df6723c946b 100644 GIT binary patch literal 59821 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 literal 52928 zcmagGb95)swk{ew9kXNGwr$(C^NZ85ZQHifv2EM7)3?vv`<-+5e*3;xW6Y}hW3I6< zCcd@iSEV2g3I+oN1O)|jZN@AK^!Eb!uiM`X`me}}stD3b%8Ai~0xA59VoR-HEdO5x zmA``ee=5of%1MfeDyz`Riap3qPRK~p(#^q3(^5@O&NM19EHdvN-A~evN>0g6QA^SQ z!<>hhq#PD$QMO@_mK+utjrKQVUtrxk-8ljOA06)g+sMHFc4+Tp{x5_2cOBS&>X1WSG!pV|VNad#DJM1TXs(`9L%opN1UGD9Zg1&fIj6|1q{So)3U-a4CWoQ*xDe5m z9`W<5i~8J4RP+_u%df<<9!9wKqF2xU;C4v(Y!-T*OjUIq^ zrN#C6w^bh64qit6YXA;^mssTgXO7Aq&Mv053QqQa7t6)c)cNllz(dg0#lqCi#nRZ& z#op;3i%_g=YmY35=!;GfIx@FkZcv@PzU--T6k$JSfDIiT4$UZAAuGdgYY1vy<8ERf ze_#6;Y0Gj4`C1s&D3DA5jB+zDeaZ7M$-~|Ga&WS812hh>B8m=xh6M+;rrcz!kBLTQ zQ`T6%#zoO?vnKj6^1J1i7u*WNSiW`iNs=miGfCi*Dt^VFDLpvE&ns6(aHeC z3qt$jqc5sVSqlbZ75*bJsob;aDw2{15z$SP{#8W_RMN^WRTA9t1p#8i@dE|&pob=c z>4dH1_G9oyVwbRrJN+fN?`US`1FRZminh>|a=RWyrg0hu1l&)#`tM(Uhjs)>+`Q#R zyL_M$JmrSVd^<}^2Z=lmXzpB8b#R7CX6&K$>&L2@1r+F zgz!9d3IWpYw~%eSRwg3?YyHAJ^SF3F0sVC!egmeXUuvAdRnu8O!fpbO9W`cf>gOAno#99T}(kXhV=q)pdA2M=qnp%m01S6(e)rKH8I>ea*Ki-hqr4*x& zdI`U`<+68^vOuMe#HwA3# z8s`VAKDK^XtT>34)+UF(wn+a!!Q{XE_T*B-x#F+2ZTuCY|7>-V|Bq|^!=^-|`~Er> zT*#lvvtv}GE*QNhqr0w37*IilN4-`iHYx6N7rsnL{NJI-+{su_W2v8S58hk&K zSF4XUH^2Qr|8=Hd<(^wQfBj4GuYb}0=b4KC?|`N1Z0aOoZ)+-JZ*T4D@Q+DHD{ISR z3!;9D#p^CVDOFK4w^(U|X|HKrsV)poRD`QQ5kSkE1Vh)*b((0}e5!YoSXs@F@I8vN z@(w6bj|O&*wNJVCI3G_=-thDLf@t(t1Sn390Sb00b0otkp$zoIbY8;|#p($5+5_T% zx)D7U#gr^$`=z0!;S#mqpWg+k^w-B~?28}g1?6T^+!k_OLLAOlIapaH>MFISon<>a z#u>JvsZATsqH?A%q`f@j4J{Vxf94o^fe%Y~;p-IZp4PQ3J;GyY z>%3S5j62F@xLWzNts|LZMw5TiX2i7EYGpCpYpq$i7awMoXdfH>B3zGTrc6*3VGz{e z^JtI^J46yB=~AkXLW6iRg9rALy}hn40|cU>y&#&Uo#uRqEi_SWnnLL=R01O17i&`< zVJiW#2yhSXIFPQly%O)YX{p^Y3fEP8ci004$zE71gxEJxgy_9Kq{!WNV*q-BY{$6M zHXo@Fi>Vq0n(gogULZ$-oP$uz>k+TTVVbRXMNizXun5Zpv>{B({=_YDKhy*EPXfYp z4&j7E)Hw;}c~Dpk1AXl{iZKIfju=Q1ReXO+9unMs7QE&}c`cJimI0sCQ~K+#0MB57 z_%eu|pup5PF5&)H2+g#WU?LGXBDF9#xLC<)f{^x$eq?kCvS-qT^WK_NN^Ngtbtp9Y zydcQ(Z_dSA#BgUgzfhXze!ELjA*T{mx95Lz$XYnLX9fr$pyt0>l=(lKsVKnM#?{%< z%~Z_N##GSQ*woos*3iz--1MJOKUrG5-<=bH#0oRL^=1%Gr~b!v`u%NysCSn&s(bp|(V<9HJ=ETn z>>!)L{ri-i58563tM8*7{92&ZhzCa-0d>;lLTy@kt5pnfFkWoWgRp#Q-RDYWeefS; zUwH+Ol}B+}KPr#HLQ1I|RB&U5>fz)^42=YYdq9FY)To}5;~a5D46?*R_Ujx9KnA38 zb$`WEaX1`c4l%3VDlG0=Q&@6P*3qmauQ^u{XKuJwnfr;0Kj#VPUI%&1%dC|!r=8#N zPGH%fl})$F&9US5&NN9Y<;}N>6=~mdM}iPhD=?q0yDi@pyU#bFF)o{Nrt}IEWK5c6 zzJn2AwF>mDXB~}p7smsiJ!OEls620WS-zy_6kjV3hVh#yN>iP929^uX(5y1C9;X); z&P!i$CAUh8UKCx{*{tQvOc>QKxJ(M3Az4hqL4jP2%_2<5QuZw0s@>CaC%b2Rk3AF} zlrojrQb$(HHg;WOa}Yl8C0n|zJ#6^Aw`Hc;u=CT*B06!YWZ^U6imwm-2HCDfDpIfGUOBbO1wO(mK_{!Y4>8Z9!1X zQyVEgfAV@Wd+i{tl*R~I)R{zqq&Ra1*yEbsIR|(_w~ue@6^*8wpeI+(kTX}#2rNxH zt(&jLNMuAEH2oO>tJJltAVu9V!=pFfSbt2hn)4v}H!oJJ2?pHAQ*;-(tUh*ONkpk) zS`Fzz+XYrdf7HRC=_!Dg#YJpD6SwvN{uj5Mng)m|o{u+*y(K_Eq@GHedFjV0YU?*;bj@9esA2Fa{2OTuko-eAN_~0mv4x94|1j5 zj~F|^e2SUk)Ghc!5JTXvKr!DY_FMOS9O%v9PQtqQR;EG4(h|rSS1W%ooPg-|bZc1q zuS3ccy$x@q0*@yI3TwMp;G-Szer=F?s1>oAi#%U`D+@Bw2&9NTyzhJh4oYSs4oYED zo}I{#QBh`7(9h^Hh`|;~k#}}k01Cf-xLu3ZQ#*y1Q6AT@ zHo1f2-zgpMk!`%VvLfUT;#?_VvIIyD`hQpj_f*3vFd~w2+k=+$^>bA`wak9n<%t$M zfmokkA9^g{AZF4VR||0E5cENzA}i-5-r8YG4ED;Z(@rb9vR2O+E!Hx<`|V~ZAXT9^ zTR~E**uY)OTA635woEfA8=S8&{-nZ>Wm*zX2TrU7HybySv)Pw6Vu{MD1bnCKqY+N zsRxZEkiz#R?r>9Ekc+rrPQa4l6O#%`aviL$Xbl{ixfxZ-$3NCXM}3zsv+Icx`&ElH z<|FPD6t#p33)_=p=KocMNAQKH|D)kF7L0Bwu{6XhWe-Z)2f=9^!3Bcs=@}ob>iL3H@JilKMZkX~On)W|rozPKGX)_ICfoNr|@dD1wM1e>P5*1Nj2{3kry? z2($8bnV}I>8CBuXB)o-d98!pnVm5VI@02Zx81I7de{GJlRjBHRiG{lw>WXed%Tn1P#gGR(bfHrLSS*7K=Hre|cbm z99yux$h=V>NE!lYZkdYHaD6Gyv0sgOYVlfZ=z1}$MA^Q&PS3VoXnfNoLFxN-#k`1J zv%PNoG#C>AeB7OxM+=P(5Zp^Wmgi?^z$(m{P1b zw?I{TKv(lOUSxz;{CTbr6Yoqg7g<9pZ#CZ|_T5p6QNfqv7oWc26-l;eD+?1|xbpN` zhRwY3RcYSU{KkeygPYUSx1+0NJ@3?>dOyCdjAnO*4;*EN%km}sroLlEjayOJFPV%E z0frad=6K50Pp;w8-xs@>U58}={tg9F3cCwO9eTaWr-#x zdFVk~?k9eHu~wIam=&35zVE1mvQK&*b7$xC4wmkmq?49SFg4}S@32Tpb}Iq9Gwy)P zj!NK&WugSlBzS=K_pL|_yBh)O55woawp3gZ98)1!do_gQIDvCf`VFWOB0-{5ToqhH z9$0%J#Mn4NtmH!xf`p>K45gqF)2K74gerVOf?$ed<2+;$iGY<}0 zljI=88SiG1&@O5Y(pI9EAZ?;TB|!rrg(}uNC(I%X4RPKdlLWSZde_p&F+UHq|1r%m zy_m`{8s+mMUcMtobhtcj((t@)?c;UT+}pe&_x=76%MaWYX76)4R1`pof6j0=;3`9% zcGpK7ZU2^Mpe9G8)S16)3+@ba>|@bigrUeuCs9u^B#W;?BMGQNngEm{QEMdcr)(aU zU|92Q4tFYbkq>4N~*_cZ9#!_myn30TMp4L6e1>bjT|g6)PDSM^5zs@?EhE4pnY%E&BpV}@kw6zV!k zhw>R32R=oSwMIS`ad9Xl%tDoMkW5@DOKU2NUdlK!vNEYeMw(plDsY^s4)W7*-?yy{#8?|q9xWM*xU#HS^kRq|tWH{s?Zow#+_{JZtrWV}*6xH6eZxx@i6cuNEv4!9=TOMd0*@DF;i69S6V5PMoNmd_$s&M#N^0W3 zF&7ylage1Kqr7ny5>}mG^er2Ww|XN~X#j4JB>^G`YZC<{O}X{umdi}<@2AV}wCmA> z)NMe<;edu&T&-;V*;=IOZNf-i^*U7^NwbW~jv-WQI{vsazo)4d6^c3kooP$WVuA5v!&X>0vnC7s7{lI%{$_gwC`zfkW}|Jqq~X z1IG+LlYeTYC;kX*)>7Y0Z5#sV5vi6C4!HQtF5lpdhXlW=&-SUfzY;AFgTG)5JZ3+G zq7F?@V5Y=wtMFp=)c`AdTHuE`AOsJ;Us(9-lQ4-@>{%>S+{t2hr4`b3lNPP_V+_x; zFjQgX$DGJxdCM`57G?o!XiL0L6F=5;{sB-n$Xq;V7CIp4LZt(2c+1!Qhxz&^rwf1o z?c8BIj^{A1FG6$fEa&0Np|1HE?{7{FwU=*BOiwtBw^Q-Ba7af^{&&U@N0xbF1bk8M zBTazgkEz4@WVrV+eSFP}6Z5bpFwPjopX9WL$c+(5t4(|ag$P(rkl%)H;I+HzQOA-x zMooM!$Y_UjhL4Eu>FdHSC~M-Lwp|gaw@j2v4uRC-XQa(dF^-S><~n`WG{N{g&MOSk z42m>zeeQqpw>PkU>9d%g*Mt7Q#!^Z(u`1}A>l&nuvg z^rntb)iMq{$fTiU!-%Sf*fWxam_Q@pLz|I(R3~NDNL%KkM*oTM3&tKA#Qy~SEQ~s7 zfk)P8jLXS!zTwP$pz{0veuv*hluwk{H3La?p#HT{My41@BcdC|Ewq{JKp+@DYY-M& z3gM2m3O%sSJixSh0#|=7d6lMT>-8I}L3d!kwse5ceY@NzQI4&%r6gmd!WfF1BdWc0 zI4FOy8CQ1>*VVx3sIV|bY*VqLrN+5*2$9t`J73`{ryO5pNQGAStUbo?j5b~Y`+iJh zsT+>^hf1!$CTPg8k@ts+tEV^5QOdA(b8sX^PAi2R$ugO7h>-@4Fmuw{S&-5Jin{CI zBUe%%wQcG8k0UfU3pnH(-`ex|`yrEi-bA~M)mI3@8yT0+dxUTySyg4hU(5`|&n zLOkgE&_~eOOasGzKJDMlbqYaRr>VoOY9i|CUtjoSb@+;4y`&Vudr=0|w&!7Vw7}Fu z7bU*4jMuj%G)ji@beeL}_V`E0IA`v=!c!o5WECv4SA_@-df?JD-?)i#<3B?z zd_q>4+Q6Vq=WFTw8=W0ec7-;Iw~2CE#I+Ws0kmDI^KkQ4 zT*33K6h&C`(!pG4-J7@j&wqgb)g+BxEvZlcLP_i&KtN>w*(4PVT`UBholR|x{yWho ztG(&}TtWInC!wWTWlLksZ6IMPgF*;gu{CTfyPrbcf(({KJtQZD-h_S;mfX@Mg*@gZ&}ty zqJ)!bMihRFMI}%Uz+>g8D<)mZYHCnPF%BAx%4rs16x5lz87b_IyNQNmQrQhT;Ak`2 zO!%GL)>H7|4UpfCVe$oIh`u*P%#41nVagpiGkNO`*`n!(?ME__+$y2!BOlRE+@di) zs>b)A53QJfi=pmB?Q1i7|J*@3p%=f~qUa$f*H^pqLE~3&u<2;3!626%X`X71uuh=? z*II6X^C~Fgj@hH&aP{!Daq_fswKTNyeHyp1vvM_bsCIW0OJ}*q$)x_fsSa87UHjv2xA8==^&Ploq2ecjJRS&J9MNqzN=EIY4<9`W4POXQ z8Gv+D9HPc1yA_6Cxorw5WvC>KwA4H7PGS9oa%bUz%vSHf8UhT_9K&l5#EPDfzfxk2 zS-hrKiQPHF_adI9wiWJva@RW4-%+FWE;9sbZl7-+5>xpW?zO&VN9^gnO_>f)2`xKC2jsm+Qbg_723Uyq-Jz$e%`U8F*J{+XTVB33x)-QW9;2v@$=cL0 zpp>ZAv_bc>hz&khMy2)d+`7ZN-(`eUh?)N2(h#{~XI~iSV-k z=pr*j=q~4&d>aK6Co^P=40&!-Z4spnYAZ_QMjM!|*kN9DAtCfmO^gkU^&MOBY%eYi zcVk~jwN#y(9dXts5buwVQ)BvSyK_-co+;Q_61D}JXJXsI3Qv4z8^+!LoYnezD2cn8w9<`xRZ$_yz_YpR?OqtKg)7tx=>jeL=?? zl(;esZbE_&6h_kcJsob+V%nfo{SGiTcO0PGN=TiH><*0OIvD$@-MBJj66qi@Mp)Y5 z)@z+3W2XI)jE9dJawjB8&n5f(*?^1N)sY)uJHpE5qjz$N+<0P#4`hO6{;KMdqi=9^ zI!xRK1b%Z;0WVp@UuT}ZAL|q6l;mX-iGzP|-kpUuy{7^{UYT=F8pAj(fG-3<#4jj% zlX_(s=7{`t_xtz3BI;HerbMy6u=c<>Qa=cPu~3i))K^Y%Vvn1FB*`yQ0x|}y)lYif z@+|w(dDW&B#PQ+~E2x>GkOfu|x)8Vgno<2Z>>pP|ElR?W>RM=_2jUzqp&TlXO(D~f zdmkMm&u7CgXP)y42MQ(_BkD?9d)E^1y4+6=o``#CCKQ1jQeyIiva`ag{dE}YX!tI? zO&e)Myj5tvxq4=F>wt5zX1cf(<+@iOT>@5=qI+m1#FFd*K!Q?GhIbYS)3{DB2SQO; zU3UZuYgU$}$bKOHbKeaM=`9Y5`}RP}z3pN>Jb(jLKI1;2Y!CR5$Hw*^0(|@CHY*D! zJhvkh(#d6&ms!M~x09nAnW$hJ`<)B20^mU28aXKS3CFzjC&c^>PWijWXEWLnM;y}l z+N9y*?2X0;w&#WM8_JV0H1<{m@-2M?q&};-D~yyrBcAIWiN@=6=rh0!1UTd+w6Ee@Jss#K;!zOwa;r2{Jk&Te4kvj;gtePY=$#4Cq4KNoWPT z2gNnW_2x{j)jzzpEri}#E}pPFeNs3zOkGdCYOYLh&q$U7;Htb%9wzftaP`I1a68BU z{96f_W4mSR=iid}B_$9L!GF$`l6KB6hBh|;IBm(+g!M)}YUU^JTw9|VphoN;w-zDt z2xZ4cgqMt4MU1;;AUHR1Pl&oCzMf7Hsn&{=TIx~Io>QxeHKJ8jl$@nlweo3s&TnpR zUQ)BRzqsn|etF*B_@H|6Gjn6lG(p^_@BK16_R2c>lXc^*ulMz_ARcZ(=!clcH=R06 z9!(UjpAi7U0&F=vR*Id+gjahDhH#fT15WW9#ndK&B@t9-RJkY}dzUB&J&(IhBjXGP z5|ky`eDpINX6F9k5@^Oyc5eaH1$zem7K=yTQ>utldG8H4W8eT(XWSIH;=t*xDy~E+ zqry>ViWP?b_CY8ZV=QV2IAcb-$gey%be>d(D*Zp>Yg6qoj&K6sk9fw~RuQruex zsy@2&-6oltnpXh_z}l<65(RIV%(nnlpIiZ3?M0$(Bju^>ZS<$UzA3%6$z)IkKLIs6 zcJ}83*`B!Zhkn_-whJF#(d^Q(iB?X0bt&f{A(2%$&xNm69N&C1y& z4JU+C2D?*kqU717|2)ytoF$LY!`iKUwR-E)+UBF>YuDPdP78pKwmxTLx9@1mFLzxS zE?LTCXRWqxcM;wyX_g6|O1V-Aa%i}DmP zFHy|Aq;k1cPgZ-5*Bn$eJn9 zL2tr-6!tSn%UL~o6ov^Pih@}(plD)+%H*v#*f4h<{VV~uiL%p7QF&#)MTQVAhpNgZ z{{ILMG5Ny&l{l_qUwEB9`i%ccl&t>s^^){U$E7s1cbqr#2|xDs$%JxYBp`nQp2_W z7Mc%9!Ve1TAL%j>VH0VL8Xj61*5w5<@30g6Du4$hnM@ngNf}g3Y?8+)q4U zpRII?S+Pl7&a4e8&CZE!DCGW;2m!>B2B?!j~5nTG;A)cdBXGj|h;9~$P zBqkd`EVE~4bew6>6_VfJFI1I<&AqtF3UzssV?wi**rrT&qd|r^^8!i>R&L{tWGT!- zU512`NXZg%_{w^WyoSMupHU)s2d*D2iJRm(bf#O4z3^t;D=1n6AP^bYpI=<53(*b@_8ib0{W*m>~~OYrER<;J>;H zC?Qh9RoJ6)xk-0P0-EnAPNUrU&JX6w@Pw1fHIU@1COns9>{yLgOY)jan{0lfMv-f~ zXlf#|5rq^j1Vt7zC`y)GUV+~4PvD;i7(s*1<}_@v-VO*+@S}Ck2kkrS7*nnwy@^dq zJ(~I$ZeU4U$0cH$iX@=o#7_Yub6^o&IKKxsPtE^iGci^Os-e_u#ra@zEkkn~s zN_>qFca|4+F{0SsN=*z*tB}@pPV7|qv1~va8%-uJLW41D8#%3AX8^3+c=01;?Rq#X z;@%TOqER73RJaNqhWcfSX<*#-V`7;DODHmEcDx>Cy!sbY6MAmevZS+g$TD)iDl59y zMhH56@(@N&|9<`PQrGs7uuckeDw?sIyIqrs1TB7JOGDd|+{usqrN=I-^pg39#{j9` ze0NnYnJ=oZEZ_Wj0^Y)T*GH`6ntW?j&mcV2GqE1Ls1X&1@q(F(rc679Gtc*`{!Z1N zU-l|*WZQ+eCx-`S$@Y8Ns^2_25m#@6Qd6K+lBYg`NA&lpd7?E5P^ZhyuBv6qsNW6a zUT*Pn{8#+5kCn2Yq`nlGiDoW7_OOJ^MP^Z7VBReQ_y7Jz$>8{gUg zlHr!45Xo>yrrFneOq9&KANaIQz9vjNCGZnJ5;s7*ZlI=RHYwGm-Og_xo6R2(+*^<~ zBCTipz33{ZaTiqIYxx1;w&Rs zf^$+-4`0T!B*$s8n!qqLB%}U@%96UO< z+&c_k{S`Vn7j*>x*!OZ-IK7cBe)faJr-Da-U-=D+zxaOPo((E@E;Hazpc6|PGXM7p zmdz}Ag=0t`owDyqXh(tLB4N&vbZW&X%?%QjxGLZ94CSY8axb|74IZwwWrS9xA+TY( zliUSf#Ys~Ppg=A0)JtysR=BHj=`6p;P+sA=5Tgm-9fC{-qnAZatyk6Tr4AWD|p=7LG!w6YUd@voC z4Z`a&jdU)pAE!^B%ZQDg5Q*Z>#1-x+dz}Ap1?@Y2oc}nt>{Hnn)R$~ic@Q=`5tLk@g-huk3-0*ziI7_l0JpO|{7&o&xm+@EKyRE04)HE(Ke;2i# zhkP;roH)!MwWFQ8C#v2VccRuDfVRL}=2?84_*ARKCFD_*x$Vo*E8I~-QhBkg?0uGB zggO`nj^j9voS%~A+9-Fx88O)rPGf0G2VPZkqUEs5nZ~sU-(0lN9#s9+fUsJ3z7dPR z$J#{jR&LupmR+;5+H^O`!`az^O!mdvpcvb8zXA*vzuD5FFh}^T;R??5F$}o5_oObw z^rXVhGCg|0H>~dTu_<{wT>5@OPh89`6f9Y5EuD3MSow9Go#b2K56F@p2Q4sr%XFOt z8N8hIORoV(HSeogA4x^aMCxsCj(Qg@T{j#k`uav32J@ul*qq#MqjH}58oPxrH6G%T zpglCcB&NjZIXhT!5&h8Ylq=^+it`Qe&JopIBKEPv5++MMXcW)g2F2mgjtz62U#M9) zf}{g-a!b>O>*3!W&n7$x4RGP5dzmKqRG_bOfwV*~Fb1GSSX|R`j%Oj99Y@qe>e6Dh zmR_rO96gtd>ICY{AQm6Tg*J=X6CBKIag?hB0eB(IGaPTp7#cDGa!;N#c*2wzj!7A6 z=T6WDC(?O*hT2Rkal-ESiQ=x~!$q0sEqWg&&QiByoAqGw0Hv1oWwKN^-lv&-QkhQp<)a3IGwcJD<}wJc3*JIA3TZp@))v+MNu#@12NN?J!+lJ#Q!v7Geb+8Yd^aeb?0iW?;~W7>8L6n zYwoLyEJN8dt@ue>?oaHtXYx25v#ian;WvTNCfFA{-T2SM#r|aPnJTXMm*K){6c^nzuC#&O@ zK!@7=$QAa&ew&>hl8P>w$BHw=n<_!>%9dm|F51kOY@MwZdCnXie9n|eHt!AB!F%-0 z>G8*lKZXLA=yO&T<(Jh7HB*v)OJo72Pqgk9wC6`#KAtd^sz&%a2<#EeSXaY)1b?8W zu7D^j%Prv*ABv5RYlP!U33MVgsV=}$fgi(Ib*gb~GdT?Zr z(b66QnzFc~d63HynR&H-i0tzCuryO;=*=~wdqDTN;rvb=H|QyalA7jn_zWEP&CrFV zJ!yiEQ>z4|yhVNr?#z8y^qFwsJ)*r~=sO3=)zU(tKQ8FpbhFTv$!N{Wo7=!s&9mBH z*zx0Ye0wUKl_n52R^^XbvtUAr)8!RE!gs`e7Pu@|vCn=nAQM4U;^jdS4vDOb z?i7JCSQC<-5mwy>hz0eCA`Dbj{(jm3JnXec{Fry&Eztqx7m6(bet;7Lv!Xq!v-Xu< zQg$I5U|)c=^wl;jf6=6}eo$$_Bh2gE#}uQEmwGM@trYv=l~ZueBLzB|2%1MdOGe;~ zoF@y+*IAb1>FmFqu+%gJ0kL5p+ehS~(Vp^S?jY|4Y|Ip;)GJ3szD6#zoWFXZvCiMY zw#qa9e1aOXtYlf6v`pUtgBF4S-HukLXthASsl{WizO9+Ix1xCp<1vD&`7L$D0YOoIouAU71#2I$_t#rSt9Uor%NFP~XXbXnK9S|ekn z88NTv362NK=gFGA{Dxyf!TNd!ubYt6=rUUM6>0QcpnLHx*b< z;B>G?IuJeh`b}$~3zh2c4)Jui+SJ2zzhIA{RMC7iR7dA z3ftAotyhko!#rg#C>{9eAH*;&b9@g3cqK<|(Y*>_E_d8kxOorT9`o{=Ddjfo8tSUh zgWcYcWne3p`wi?v_O|QK&QmxN4%4{heht}RjK_u2!8yRAvNL}*w}3T7d9iKWa_iV9 zJgCbakZqF8Tm*Qg6&mBtaf{ZUNEI9vm{tx2gm>)^%L}zbG)X9oW}H0B9~-s++>h3gmyS|y?|8V*>0%2Pei9Mo?L++j=$ZY(F(T^E_Prew?bu4e7%N^M0{xX zeOZ^Ai2J<|PgV$f>;+|R#0Po8C;(8;zL-sT10N`LkA|P{ATc9AgYH0GI|tI<8}JU# z1lYau^!?{6h94f`dJrSLERlM^s9(D&dFp4Zfc6x(d4$u@+Xj>5l{4{EZkyh()sW{< z%^5$avWSz?*`JTfKi5T1JqAMDa&*j!*{5w^kymro0B1-YmyYuv<=yQC42$x6U62$z zUbD^&KRtulVhexIFlInB$wFF*1X}(GX0cBuo7HyHI2sG~$e0O?Q>tt4>W>Mv;)!z2 zQEjBEhtATo8>ntbwmqf76 zJ&wzy_rfJ^iS%qO>CtBY$SH)-jmshSve0O*NQtjtwm8>F;Ou80D&%12Mo2XLEE;H% z05IaClsePtPXg)P94>(a+}+ZE@p{k^dyJCKq6Pb2@UM{{f`zy)oCbogn$OJsIslX$ z_C6{0=vAVf{?iQ>Xiv!eH=a`sXxf?lmpH~9$l{&AWqb;`KR{A`0(M`-7Cu2-7x;o_ z#43n>(`5M`t5!ROJN+%(byMFzDoKZKrq&(led4w`o&zd=+aaG9A_y*lVmT0P${rGX{95rdF#hp3jo8Z{m)K^_&W9G-%&49b}E$8&%`81C^8~)97 zr_&~M6@zn5CgW=MGjx=o2My1|Y9yDyy&c|GpJ*AZLsi4c+@F8re&2X%rQZDIeJuUu zef(cIO+xneF3v80iA}PGmUhZ6hE6X3L;BEkUr$z zfN6sU%Mvh#V$DY#>Tv^WNE&A%*}~{}LAYH{?McDNOi}iHU-z5i7vffLK(=?t$Z}3y z>rLk-{`2+uVh*I&C(k4V&>l9Nl-7uI5F93;8`l^l#Y&CepGbhiPchZ$Q|;+O8H6b< z3Tz|W>jA&HkDMBdA`MJZ88IGm;SEMzi_U3QTM4QV^*~=PGTd) z4Ao3G!i)@^C3}kNu1xJ0&to$ZIzcBLeTHa6aiyZBKui9vO6 zEps4de}Vsx=pRn&G=E#|S_E&P(M{7*a0DoVGZUbE=*4jXOYw^L>24;Ob>hr^`*W_^$B~+`fs(Bbhnip zptMp@rv%xfdPm-zqFs9GQT}XEGvQ7~Wyocj@T4I zVdim?D`c{`FtsCO;#0$prGCZZzn%3(W%%azipel%uj>f=Z1M03))SCtQQLuxY>Xz= zsgf+wB2gycoK*q4L3+eU%igA2t6E)k%n3GwFV#)=QEg5W93VV~hn!h}ZF&tVqke6M zk1St|^=dSY{CR)<1#hQIh0rs2X_DE_fa(+8DVIIn+{b`!n=M5PWIfxZ>DUrItraPE zX^LX{ClbIi#d^@=5xaeR=E-hH%+gjKZ&XcE;hypm>OWV)xd2g>i0E08HA8O7vdm;d z0@7P`551)kl1;h2AVZv8V5KY^H}uPmvPV+jp+r5q=hT#x}Zk-u#WhC-*HE z0VLO>39nc?!0ngY9}%>EV=fnisAYfQ%~<0msv4kSq~dHmCNhZ#YJPIg@aNA#6*Sxl z`MrrSKY_{D66#xZL<#<1DuQ(p(^z-Vhjki#IdzyyRIA(v2p___BwN{cPx<7!f;Tb* zIEZ1$*p5QTzj396vut9C!Vey`#Yn8lPyeV2P1)uQT9dd|q`;=W zaNTVaL`Wnpm<0C_G$*Nz8T&s^$TOy;!(CMx`GM~hmzz8HDDV3NPR*la;KRrP5LB2j zxMjP$#9;m3`uGw3^nbn|P(zvW4e1f&8I(j1XR`a@60~#tp@1{UBu37>BM2PJoDbOo z@UjRQd|i-UWD8vLQdxHTH9=P8lljHT<3n2$6DH({Ub#7LUM2sX4N5*rA36*L1Qh$X zEJ5*~OA`NNgNg!7ja~oy%d=$la4(d<1^jAS&HDz-I7S0wWMGIO660%!;6=8Qwx@h8 zw#Aa@#+2n}WKC){>fe_0K}}P0olTa)p1Do38)@h?*zEb_O=mtkEBy1d%=Q?Tr1VL? z-=Eu=><_-qUFjZ`E8h?Il|XL0JHR~Hzl{aEbj9HD5O$%le6vys_awJH#DQ+$_H}`I zNDnM|hzs#%#x(*SfV;GZnX+oh$6ju4_3-{u#&>20Ak#kj2>1pcz_;HRYWa`{oq7C{ zLSw=2cxEutzd&mF@CL~N-y{gRF#8KUej%YV5V!3Fd@~Td`ye%Ihfcok8tp@QczFXN;74+SghPj@l7(k+^!1!^LE6Ut&3HzI#Z}D(6nek zy4hoR7(%4XbDZ9jLpsWRGI$p_JMHE-0H-4T{`30nL4Xs$p{x{pZm2vU(YYjkK}LGz z9$9Uz1cQcmA)ewY@eSUzywEe`(!P$=wJ^{!p-dWUP0~lIf0=I}>pYEV$wlmf!@7c# zYsIlYr!!clPla}CbUuGra)5-lv?<9|gx!*5QWLt9IC)xA&G<295S| zsd@9S{>dP-AC)LJ)@3si<>?0%<;+($4LdP<5tM6tKx7p-)!aqqt`~Jdw5n*Z}m(DkE#5)pu9U*+VoqOx>!#PlS(b=1Zn zt+X;I?M6#8ln>1dLw_&{wGxsxZA<0{C8OZIwo(GgE1z1~)Ef`Oy>$ikpXh+9_8pHJ z9kh6^RdO_Qa_2FP^Tj&5M2(9D^elZQ=G_Hqpjg}baj3-fkMX-aqsP7+*@GOG8?C%-(v z2Oz$|nSIBi#A5j*1uxlP(wm@A*-LLVW79H*qr%SEVis#rqZ(^_&31QoTVZ@hDt7`C z>@_3-^f~b7F=2OWVZK9pA#V}D z{|xq$xctC0jKA1x>|n+9)yQnV;muu8dM~Oe9`IaV$kfIXqO4!GRd!;tE_u65v;w&=G$}84X0mv&GAQ-Z=zrN& zg{kmq(ky8_bvOtq`iSwUvL1H_RT6SMp--%LT347zQ_59++G;XoV=p+jaB<#{*~GwK zJJ=9;p44#h*kYT%p@@p)=NKfETSou#lx;SNMjqrV1y&@|K`Y zB#3U=H6yW5xfBK@`u`iuWXxQ7^)v>d~^s#x_ zCw8}LUfQ+?r2y}Jscn2ReEC)~0p9T$HH9K@$TlZ)UD`yC>*aZ-Okc4%SYg~TmSW3W=D zaZP6=@0#(LI1kK{Fz%F5<(`zHI`(P0U*?%LT|ah#Ugw^q(_PDto;$+#zT*dd4>WV- z!p)jA2X8^tM|NLaUepq71q7xhKW9t8N*G~)GF5#Dn~8{SR!wbs&V^)oUg45UMFw@0 zqDlE)`m$M`p3TyDC&=yhLuF-Cm<}>9CJ>oLhU%o^#-v==6x~k8`6KqLNhQ+i# zlZw^ajL)-c9m~3)ir=Awb`wgOf>o6VW-_?-T&@%loOh5ki%c{YCGiV!%g#3PI$L1?Mux&!~(HFr?gsh;*%_}2sH3%UY6>_YGC#PN4FM0AH3@7&@9 z-yowq3XfaNWd-z>edvAuvj}7Dv6PksTH6@fF0Q~vq8QqsSO2hO8%j@Tt3aA1s*b5I z-_nh!_cnli^JWDH&sBtlwWNDxp*E41=C|!1@PDN;wuT#A6#V^R0~O|9`OjGBA72pv z6A}H_PV%2b4Gl+|VNvhE8m2~Ejc9MESnnb$5i-Sgcquf3g(G}57Wwfwth+b=y|J~tmd zBZ+@JUKxQh2hq{E9a%_CT@S zPo|F(E%so5iZ39x;uVvxW*-G0)JKlyEj7f(Q@+3O8ik*m%#!2}~e)af}AMugdxBKJqvubZo<^DAiT9?V=%kQm1A3pstw&hP4-Bml>K3;05 zzH)<)H(+gV@`EwghUomga_Dc;gCIV1@(mR=OrG% zhYh(9!h`DtVWmw%dipx=v3@m^xOt7?)n|Ct@YjQFz%3DGD5}K)sjL zS;%U;$EBl##S&h`C!lkr&-V94nL5X}@ambJw>|;8OE47)Y%1ogNUSQV zJuDAxJ$u!bsR6e&haS?!=)!`!I6e{s;o&Np^hrLo@kwV)*#ywLnsm%rZO*)hbrX(9 zV~O4%>v&LB?TFtjk$b8LEjuO%!*%J{`y-Dih?_NYh?!NrRjQYt^$qS5L;YyCTUH~*kWrT-rr+hxh}h(er1Hzus070F z;Kf|TXWB)xdAN5w>r%QTz+QEsaNw05vmK-fe?+aJxQNEa$m@l6lT8)6&aW&v1D|C% z&nlfNBK|^9p;>nX_U3RZ~-}6XjEskzg2&FD|pK{gM?0kmN}SXTJm_01}mhxRCfmkdqe-_ zT-SE<%BqSSxqVtT9dG(aT%;qtS#BM%V@jzmy1O|>-og#L{(w3^x3aiQ28qE?k9W8c{%YV}w6N?IXQ){PT2$TNt7d+02_5Hqtp@7w zQyA71Gw3|=%9$>@Y55tfsLtFA=|1mL^__BOo9cS^COg(0nmY_`&SAxzI#5a!yVX|N=<45NuUj08N#1=k z$+fPx=U|)Tim38K&)sy|qO~lx)e5hZ60Mrw^}-F;;bafqhk71!2&U(ofo+}2jNhKS z%c@I`Q&My3o|GMtb-b`h%ZAzDm5K+_Brx>GG~CRq8z6_`k0hS^8oCn33+G|9e2pe* zxABK=8u1H$VI0SE(>4};5Tdvp?sM(C1&J{ry3e>lIMhK^d54^X*AHdd{XvI6{G;o1 z3|R1~YmPOT7@_fL{f3-TM=6-ERO3bLl782a%=;T6p+o2_ZZfdu(Se`kswzXs613Pa@Cm*oy|YJE zNmk+vsLZMJL;}@bo}K({Zce+Y5`)d62Z3FOj#G;xvm#fb6CiUxiGdZE-Dlj2ux5EyG165HB=YpMA{J@2yG%D-xHrX zX1|V+pc_1}gC33x6x67~Il|HJh&A##{XEBZV8uV)X(eq5p&h_|XD ziV}J54dl{{@9(51TiBQjsbJ~$;+*JUKtBm$yHSbt0%{1lO+ISvujp0LvRkrq*v^H? z3dMR$r;qH(@#?9}bLysd(E3)g@%+WXiaPWuJ+Mz}cov90fHu=lndkF%$CX8+)tjWt z`i_|D1dpq-z9aZ%qgvJgDdtwIt9Q!Z>3z++LonL*(M;)Jv;eDLm{Md6c12eT=UBQc zGyGu{yJ_BQ&Any%yvarP?@M>zbC;d8s3kkMHgFl)oVT#{SBDlE9ZE{3(5qb>2ux6lE;^ znFg44H{f%<#!U(ZWcr%>E-fkiuw zz@i=E{~YQ5(}?`vxUDQTOIMsl^vz{#jc^_bpnR?n0?t7AZAB6uhE!JYE4QBjBa!Uh zkc`&Q9AOM|wt^T5MIKUaXCKK7Xi=&w0kWACj%FoCAwrBxRrR9JxtI@xZ>}*xl+k$o z9{C?lzQ--*AIio4VoY0#ttne^ko*y$A8$sO?xkLFN`ufa*ygX8~LVj!k1jMaa#0R8=Qi~O*hYb ztd`rF-EyTsbys$r4PDiUJd%pUy3HK$NYxl7Ge!LZmRw?|VSS)sNVe^e1(warKFauh z|I<4lvr%%QzWOdViQYYUh04iTn?7gCQ*?@LUW~Uuo}uereCA;}!@(z?apJmlw!{3+ z&RmfQAG`s9A_u?tXTouys_zE1i;et=8HVu;)l0B-#3tK#-5VZk3`Gi)c50wW!I~z$ zheCvcE1vSq%O-9^HgrF$A}W zC|wA~(;-GJ8T~P#o13d8eXeja7#dK`S8J18;eQ>>{+=3ybhaN^v>LsW9+rD#Rst>5 zSkZ4eFrL)A@nHSMYcPa*=~CaUWu*U@`q4V>xKqOA6O8F>)vJn!Q>!3W6RKrb5iPS) zxzDyyU4TSCtL9CKM{n5DmlPGas#1TRd3yT9sXKcE*E#0#r&Y{Jdb|~>=F|<(_QXwT zKr7!9=ZZ4W6E^tx_ft`+Z_p2B%_;+@c3GZxa(`Fn&Jd-)SR*KJs>4^;o_GX%NL(MG z^C&>5h}@GSIKl5!6n^9LV|@m_wPJc%aUAl6Khg7>fC*7M)nN(_%-$bPZ|KKqZD3PE zs(FOXq&-~QMY|J3IHFb+OrxaMfp-FCSClODyp z8DIz5eaXd8BJ;G}X0}1`^}{L0GQKrLwV->#9KchLNzt__0+YSY(2Vld@Gq`z4dqhzpWxKgSU^EYQI+zlAv-tIsw`b+;{F52s;~WUxl?n6h6N zPHNx6tQi6B+AJnv(k7k>amd8)&X@gJx)hmg_wSbq9UZk>CLpNI`bWZ6Q%Z>CU%0xHuwM&M>jZd@e+F+d zxZmV;8{`GoRh<>}Ch)B;zA=T-FFANd;tUeqVd%2ui-KUh+` zJ0xw{B_L1{#u`$S8YNqRBgrgF!14^9m|(UZf}2u{lOWOysz~>AJJdFx;Fe=gM(~@5 z?F~vX*@D(FGH>Dw7OgQ2cgRW}vl*PI2Vi{v8|9d~dvFZ8g^+P&`cV2GmsMRWSk4u`nAjyAFQhe+58vjP+66U|`PFDr;`T^L^?|4A^Jmr*yUXsk z`w9+7WvFc=OZ${|yZ{T($I|_g(u9=)-QHM_ES|5$=leCeU(Yusii0^Ec`ps#RwDikO%Z*(X4 zJVI$7=qjLR2P+wGczM7Ohg5(ZZOG%7t`H1}7rkR3s&q%~txJPEImU5gC;h7Vm!eb) zLLe#P3kZlR7zhZ*f8O8zM^P%Nw5_4Om9RO`AYg9b{Qqz#Ns3xhI6y4il*#6zQ-ys~ z^O{zpd#L5_wLL8<0aS3J#vlv=FG}fnBH8v;ganz0Psv{S>pcD*0u>(S;JH#{uaz{% zS31X)@n4v}Af1C1oD+Ig&`5GJ_Y=6&-ktXfJ{#rV zWUg-wSxe86*|5_t2Y^tZut;C?*()hLUzF#YEj>cdNnwj2cLL?|+nB(vv-=x~*-@*z z*qx>NW>Oj!Womu|Pnoh`Fp#KyqD!cwc{5`N`}vlUs2J8YQx8oRh>l4`fjfjUMb%{f zMeatfs6JXNanGM*9odS`cSo1uJi}V70E!czbY7 zz@Ae7)Cst``o^3OX-WvMh4Hg@)F*v~RcRQzWnrtl%h|o*SNd+oV+XWnelIhkSwpl% zMS9LWKIg`5^`aNkB9Xtxk-hf_6udV9e~kQ%h(QyQrZBN!ynsYQBoOw^*u;0%%Y z^9{8f^nYr4@rIH(0O0wi6cPvs(SIHZ{}X>0q!#9jW(x2zY3N|)hUdgURi}(CMzFdh zhK+ArAdPidXX&MZ(UG^W=U%1RoUk%Afl;>ZD*t2Cgs)Pli>?)u+-yZTv!|lWqgkb@ z^@jO|xp17Zd5)qwLH`{6_`0?4nRD!UJf7s6;|tN_@}^{L7*q?!IlDoRt!2DVX{T~v zFFlkG3o)#c*#kz+7l;&bL}D-U2 zlB0Cv?jIS;4d_$Y5T&pDA zO&ghs8m|PKt$d9Kv8{5=3$d+s4F(}M`ji(w{}dNlV$4IbKa5H!5Rq1_A7kP?%!mtv zck?yclIFanDpS7$(7$`~6t>&RZJTOCUe=LJn`i&IaDb=ux_3iT;3_M(K`Rh0q0VcO z7G05X38WU{AP`H!REQQ24?W1>g$*NK6qso>1nMnGmLO=Za@ee%{%ou&sUPaeuR1=l z*W1v-jh`8CSLK*cKML&D6Nio=Sd2LZ)7X?o8qnc3EN-LKZn7S##dC48w;Y;i^(2iH zuG!z$bX=BfHz9ozt3umkk1~}uB>u%dC~Lm5+_A-*0Z7zSxPkzC@xv+p$$uO<{J6!ypC4BRb8d+v>n(2c86X_7vAN z51}8q&isx8Zp+JVWaH8#RQ`vEKZ1W(8Na7$RN<3zjC!fMMx7o~l2t~zEEdE``ihM8emuAADvvhqUU^!p{)K;jtLc^hJt&Bv#!TC11r5CCC%9|Ayc!4csf zOqMy%5CsFEH|L0fJ2-Zb7329HrOe7UP?#>bDAm_1GTTYBkB*RX?TA2ieNxULmJ{M1 z`NQmq%%^B~*-d507~xm1t?`>|Kl+<)KY=gz!H)(WzwVjtI4SPu{?^bdE~rYfx#TvQ^qCD9x;$)zqdkvMUX}yJOtK z(ygEED1PEBjex7Dh{60WXHwQ;TV6nEz*yJCLlQ=caT>Isbkyr^ZRAR8fdC!9Ta(mE zoO?Tq{92(sb#~U3GrI&+ASwOH$ylJuD+;UkaeSN&kF1nHXIrL4dNEnni+(|3d@o zY?FCo5;-AS40@8de#!E3 zuq|3HJy!U3mc%333iWk^)=Ji~Wo3IotEU{aF<_IoOG>?KP8(_RkHf}snk9XCBGOEt z#QCE(%WhX{zDcGbKN%E9wyq2LdjyrvWKzXkAPd$BRjxgQ+ZUNII5XK9%W>4cuW@=` zEFnciml4NMd|O$GF=sGtFl%iXX6mb+^O;HmUCQFV3sdQN8<>tfl9EpoDfR?Y%)Ich z1=~{U%|lqp2DZ@Ty(?y{VSA`=7d4kz+V2aV+$fn{_@H!O%Rp>+&3wh~Sm+L&o57~e zy}S3#eo$?}sHH`1g(pL$BwTX^Y z;tcpo^D!~|x$2|47?8NceZ3-=>}X>enMH21!-?DO58R3dch5`s`WT0R*!D!Y`UI`? zOsUTyVZtL~!z09!Lk2=Gzt3Y_qv#S;zf9>FP~QR*3_>dwQ*n)DVi)@s89)6v7b8u7 zRgxnF?v~ks#2k)%7;?=wrt(DHn)!hbj3;n`*I&f)f3VPLUH?JOqx~;L zxgC&uLTC4XA>P0YVOmm#j;dLPUQ&8gVo_#l^njXr^4sWyOcTW4D#aIo*ydfQKyGK? zV?%%!@H7&{z}ei&h}OZ_(AeD0>2J?u9pOa;!kWMD@~R04vK2oA>T8|#f5MU0kr1=W zEEZ-GV7aY7?kQmSBvX3_wm-w=LWUsf=ZDE&%M__v0+>AurP&}av`4I1GX_qnt(b94 z9I#P^C#Fj02rO4#DiCt|=R~@UuZpT#W(Ma0pWOtkV;|fE|1ZM&>s5ho_kX$ez#!|t z=<)v~!y8(e{}0srU$@7O+$Zw@5k^Wtgc0Mv-!5SAmr2*qNyygP8c1f7Hn%YbVhCM; z81(

n17d0Ga1#ykKw<-F-%(;vGU1{_xi_MoSs*0jz?RY{Jy>)kanRYU@+$=E3C-9(O>YUlO6@# zIq}@_An-(j-3I??YZ!+f-Il;>ZeH01F9!d{EG#DIJ}@ z^vheg4l?BGJ9BC?chzZF!WY+Ht-pNqNM2Sja^B`X7IaWBS!td4)AX5hbwVzjq*|d( z#F*$hF1Je0QsE&(AI$K`3impOyp35HH>j>c#A zc)|u|AraRPa%F1VriFV;jhAnv-vv*$QHZ1_^H?Q1ur);4R9it_1!U1&&7z?6u)j5u z4}Vb?2|wSI5>KZon5t69&VLnECFyvEi;KYw%|??XF$+?(4_w)TzPXx*{bnTK4pTYr zLsF`Ybu3FwWt+8C+tVQ@7nrZ)<`wrrstvRT~A3Hi8zYtU5o%pd-j3&_cq2CssDi zJJwaHwIed?k~)``lN9E7>&_%s@xUBV5TN$^tY>pEk;o*ls4l6rk_J6OaB=V0JqhJ| zsHpoC7?e$j3|N#Uos#2F`;m+1+_HfW?5B$j8+OVk^}AKEmpe_2oz z1!3??fz$30sQU8!`?UM_|0-kd=xAUn#IcvG`zvyDQf#~Rr2Py*!p$RNxixt$UsmZ1yRFlGtID@Q^gKN$R zQo@YG4EHMuIdOxRBxg}nImA{+O4*}bW!59UYM|3-_$=TV}qlJgh+A; z7chtCZp0ByRL*zXtbzc1HD-SZ*ZXF4{5$z#Ao^FgSeQ1OwB>DqYHyHz9ENCfnl&?t57-nwT@DXzDYeV zedJk_K}|7S3en~y!2HE;kVws3T{eIef{2rd3qX9qXHMinetQm*=e0}G_gWY{f@_3N zKJAL7ca>L<#35l?(9J0u2QC+{F1l+Tn<2(_W9Ee4=kvREAh&@RSuu-0*B3R6oi5-sStS-lL6n)77}KNEY%^hS%{zg z5X<)aeiZI}D_SlF5ASz{=;@CZxunZ;ID_+wka;g5f)r30ePX{2qVd}8TCm#pW+Pp8 zm6eU!aoznQCx`@H5shhPF;*~uuo(xL8Orn5Z~EZ3n5umubIkX`)DKAibD!$0lwtad zdm8}UczFLeGvFUXUkNA)*_Z<7hn+qUg!|u(H?owcfgD`450iFdee1m20=*`G%{+M{ zDnfC|(84g7I+U;QVOzx)#qb&~qnF7~H9eylP@XrSVdO&%zKJ)JE>(h-7937n8IRrW zSL?Q0_rufl+aPE+6FtaB2v`=gb-9MKe!*l-sa(k_=~fEE;n6C=KWR@#^fHK&bNKaU z#%wkXu*$@TJr;SYHMejSny8pG?JfKGkh7IvDN7+j=1j$}vcTt@AHd|eqUt@ph>4y)I~o6QsHv@(78a3$60T^QN6?rmF1lJFk18w&GnUWekD zu=5zQ{Z=GWn{m%NT>HU`;o;txxe2;NC~rc`aL~hB?^~7HmW^t>^%eqU-1*oykK<~d z!kkG&Max*o$-iHp2jklVH$FiC!4Jm$C<01h^?&HgC%>;95sm|L_YY9c$eIyI21y*bLj`C99W-S1>?y4}(_&K^sP@Lw_yJ$XpZo zM=SWJG~zIH6&Ur1l6YK>8JHc;zPzKzt#AlGk*K|1iQUiChcE39D4JHDH&>hO$-DuK zd08Y=TC0wS*+kV%-GZLubSU)59=VI=UO68^Jz|U#!?B0^sfS-j?j+Ej(Nx{ZNgJ1J zuu&AZNQ(vIxm$(sDI6+BcIalui9=<)3@+JNhp@SE7 zPbl|Px81D2jIWe^NmK|l6b#C}i%~;4_nG`PE<9$~+$s#`{tjny_X8z+x9+-Dy12U9#c~o@NQQ!aD1hai zQg{eg#`_?KZuOt^yW`SMEz*0x`qn*3y;O!gym%u$jjj5WQqvUAeCYC{fE-0-?i4ewH{#p@9j3t0_Tw)-~p5E^>m7xSJ?u7Y*leODI|q6!%N& zeP$PRLqjagTc)WmK9ep^9po9lA>Z3-1a{7Vb>Te1Iw%=p7=a_NP{ZevAedHe=+ytZ>n;FRy_n z(T$Lgmj?EirMnA_Iv+>f5Yk=q3s=Fqb%cORz0EJ@R4Zpt11Fco2j*Ga3RGW6t zjXl#mZy)#lvqgZAID{)n8V46{1eAF-H?xx|-W|6|R6iX>z9r z$+VPuP%_b|p0&!(b7yBQN7|`M*m1nY3vU4cwFG_RskLtXp$OjyGE5BI_nqxeq*IN| z_D!kXcoOT*#=E)RaSUB9_ti0PJs1N@Juua==u>vA%%k78W||ykun)Ovy$G#wc@*GF z6Cw5M%}oUxrcWo!ur7IGy{cAfc6ct7D`7EICxR{h0`M>_bT&#{2`&U-rvgtc;KP$J zTx##CRZELp&K4VUc#DnNi;I^FDwE3dfNjBdd%pcgJg&;&k^1c&3AQUL2)TX0&#cYj z@))ws0sxz{pyNWJbrg<0Z}pb`s)ZHGA}y-yH;#a9>Q)H$Z*CYuuu}%&eThBI`E=Ws z9EiqAIh;<1xxUKi0}Ye&q)po|gu&FQy__%&uv3Pzy^e08eRr_BJrTeHhTfC449Ql= zMGMjP0@;)1Zlh=V-AB}q+?|;70RCOU=&Sczg=?mc_h~ngUXf1fS|6gp>cqIv-)w(Y zzzW*ScUa$oQkEgu3Ks#<*vkpc_#`<4izdV#U^U`yO1)Y%Z`N-recRv*21(^Rs9Pwl z4`2@#KcmT-qj8HDA?zl{&jdha#?1-ui!tfFf41*+F`2O}teMl6SYgeV&fC&oi{hPY zsXO0Wp}TpM!*0D@;UdAj|$tAcg2pm{|%!vb03++$AalHpC+ zF`tdU_WvsB=_TVJ`Ml9B2m98jF729`{xHR6vC1p8lmq~Qb#vG)y4A(Qh8s0MExB(7 zji&!-JdA>f;O$ZFj<&}<-RNY2WQsOm!-{N-dkKEab1@_@J>^S6->5~2M7}pWWH61w zi1VT`9xOe&-VlP!*fO>D7V=TFAKANk-YpKdYU48#FnW(Q${duf*{2lr zSk&A1I%l=(ZGM^ieC6RURohV?AA%m!5NL|Y^-Ow!FHEKHS8TSACYf&lSv1QT7;Gxf z7IbSik5*`Qht@ZHHiM=rTmkbf=Z17k_;*sQ*#OTM4W4l78!Wc)gjUH+!74Z0s6Ci_ z6d8&!b-o7!f*k=X*D$EM!y^2F<`ACHDteON5Bo|09I}{hey*tSkXm!ZF*_sU6ZcAN zx~S|R7CS_>iQL=4A@fRE0dw z&n`=ly%s^>`eqx32quMZ%&ys%65d00VpRu4#>_u{CHlZQ$1?VYu_>Xa z?pK%FuKD?C&K*1~c>8xiGV9c{CrJ$c$7>73`~YJq8mfNB+aSjoXbGYF4Atqj~;P@r}G%%>~%KBTFG4@ z&uQLc&gr(t&PLyApLa<4p6E!HBcuCUHKZdlni1qWN<)}&R9#8+xVXJnG+hbx{cC3! z5f~g)U1le1tmIv5CQ^rIZ^$|$f-`t;^!_>5j3}_p=SsZPLO|&X>*U5VZorjL(TO*! zcJRbjo#~3|s12@V^wBC}fMPSvCRJMc@3TPl@)cQ~D(Qa~M z057CaRDcm<3rDS^^XN~=Qu^NJrG=yHycOTFL8hmVWfNnY?o{kYClDZDKCO~}K8v6> zAr>{*Gz)uNt&~7-__N!#i-pJg-WiSPI=NsIJxC|i*ZTHYI?+KMVFcKSgoY@AEUL_|6`=nuM)?Awn*G>eZf}P@W)7tr_ z$=S@5C2?xFNPbm%=F-TVcSREMf$&dQK?9bJu=-Q#PE++?az#=}`*2skj=VmZPdxpm z!Jpw0aF7zL+GC;qtpp)HOcLyhU<_qj8)+!uwz-d@|un+A&_NM^r#v~{`unAz=pIeGAY z)p7-LV6PuZ$2Sx&l+wC@36X`jX#Jh^oHU(-rhkD3V#N+ zzO-o^kuvU)rf)E4ACX28lNa7or}#TQI>VR~MZ_7zZ)W)+GYT>z!H0Dd0J1x&-JOmyHYmjX_nBG*^7d zca)J#r+a|b+BBu3bRM9$;%N~t4kmYg+kuU= z(ZZ|9p0%1=Yp4V~gFai|ijVbV$}(?}3pXT~+cM9!S&wAY-6wGv+p2eBG+@W-xjy4( zsdabRvaN6ArIOZ7rP413h-!YBA79E0*P6LX%YQF3;=j#1D$$nZEl-^;Lwwhpo|Pnc{iX7sYlh8eEUvT4B_oR08Ch=LyD%EpuK z$FXYA!+X?F)0f4%Z;ZkOeTXmW!Leuvc`AyHBaaJYwwfOE_`|Ye%n{QIk_H!B-yAcNL9%n@tk(wF{e4Wi z*YThzp@-kgt~_1dGcGdXBO(>+%FiUuVE`S*I%Q!^#Ed|};g+a?SbarqV6~<_9#uv4 zOq`w$N*kw;@H8ToEg6p=WSvuS5sH9cX|hZOy+7&uF_tJ;mZA77SA@#YRb(Jz4sC?& zZ9iI=A%=zeo8i#2%xX@j(464dLHl{r{qP|0C=Cr{1fo z<@gsMB@t`9P6QQxU>Bdz&+zL8254fTJao%o6O^)P@40e9=>9W&W`&L|r6>`EE2r zxx;p1l-p6g$mL}AOK3<^q7p-%s74hBC&?PgGps&hT@^>v(KZLgET-y$!-={qDkTP% zs1HlO@XBlu7HN)(akbbZ`YGH66)p^nC782Lp~&#pkZZA77aY>aGq9aW0QO7@Gh^;r zuD#;o!JA4NGm_28YC)rw78whYp}$SK>%V8Mh_getn`tG@RbJ9aa%@1a)kn1DS7E@@ zrm){{lr}XMrU%(?E|71I*r3j$Y%XLapemk%L^6ssEJ6t3;HSnR1DasdDFJe_%E=fk zo|>Isd#XAuCQ6&>9`?)Y&?FN+twewX1iH8~9GnP>^xPAfYV&_|D^Gk6Py3+ zPmvm+sxUZix@*t%lp8sVy)NG&w3=(g*v;3}H9~{n2G*`<{0!)VeFzm3HKT^T+{=!9 zg~ivC?tOjwF6e3~XXI77L*g}oxTGEP+qju~F@GKQLI0P(+;y2hnBWV1PQ(S~J>w5c z!EHSP`X(*dIV`>1V@p>&=N|^jy=qUIz3jv;+Y!_%Azlu<(aEmbiW8N4Ej>C>p^W!8)+=bWEa;X&p4@)C%gMAm1lt;`c9emodvVe586rbR<$30@t$ii}|ENAgJvi);r-)IrQ#b;iHaKqQD(#&o?I=Ud zF7+uCR*V6>bxszS?A9<5y;^0`p1($oDl0d|LY4C}aFXlGMV)1=V+3X5>qf2$#qUlK z6$+AtuHc011WRoQXwC%mB)9Wpbk{{No=kh4KgyF{mG#SM*s6J_k9FA&{hd=K(2kMV z`txzCp#v7V&EIo{c(UR2F0Vl)I5rnXUrb~XJD$=xIRg}?M{{)h)|j2@Pj&Vybsrrm zHR|XL`)QUB919!9SDx_pRxi7atwV{bcQ&!Dcq0j;(iIzLyXn9!wlL*xEyPPW)4Hp zH!1b%x`dQ7_v*?vpA@B1@17GsYdX91eRE-VjC7Fg4#9N~6n~9D5YB*I=vc3LEIRU8 zX(7;jO0zyYcDOr;&pS9u+nB@{#k-D|dX>h${XUvD^0iQK%4R+dyNBe}ZO9uRqJ(~x z!&@`q6s(#BPp9pscFVzuV#CvD&N1H|T>^%pv$grw0@c6-Vx4lSx>UBh2bG>6VX+QW zMe=z?acfWu$24#BW#21lj#aJw<8Lix|B8t+t+c00fNF2?zq?)kWmW%YO!WUDDJCiE z{N;A#ZO~|Nk&$Uk-*b(m5~Z?1`$0-<_8rY1Hjd|sO(OVW#6;DEg6y;4SD{=G-xJtN zLAWd17Zf;i7yPNLj^pfcUe}Me_jmXmW z;6mM0Nv(i;Zo%z4S>d!nlZ``#3`_H?{X)y`(Lnv(htU!BP5Uh9O{R^RnvEt!L3ZM7 zQh&jCh4g9P9H=Bsc!}dE94e7UUf1@61aF=h zUG%qa1~OMNDu0B?L}}i9cO5Khl%ne1$6bMOOchuX3feV$QDH#S)oH)r38zDNcE(P@ z8cPt*3GG-E{OJk0wULdc zur*YUicX(%FnWia>{voppa}& z^|Q32cA$W`Up9Aevy8kha9l#Wx84nCIMo2;Nado7g0A0aqvil@9McpxpxwyB5lr2w zJ9YGAGtntVUYtK|uo+ zCUxQ^#nVlTZ#()F9e81~x+GKJVC25k>{Kw4RTgm;&!yh`s*r%H2U zxXH?;YSHXdrHRsE?@$&<0Ag$rZMu|ZFO;OYnw1n@OZcM5o?}51qN!vJ^hp;^Gh1(T z)LF1ijKs;r5>;j`s}%2#InkFX@lfeh2pPBOYm@SbW7gj=H!^}AW0`7Frpi*7mbMLp zhneJof(bG(MBX)l4_sHchRxD_hN+2@_sgB31YFLZQiCNju0P*J=v0?quv>UTR&NHt+T&{qpQmZqok3n>fq5- zthPQ-dnZH&lmNOJfcw&hAPn5wJ)oM;&cOfxKq$*cLul`d#Uw4 zUVB6E_aKoOT^_MBH?yh&Q91m{H(%KXL@$lslzXSI9burl>^U+|%MO^MFylIw-L%5G zAbXUK>FZlrpc88Tt)Z_c2b_uLqu!*sem0HL7v}PRgK?7dnp)8c3PhB z#N0O{^-9nd6(=hS)Q(tVLb9sm(zdcCZHE{xqy;*9PT*cehUi9Gi+8wG(K|y*(BAMX zCJ)#cDTp%Bo#Sk>6*BwVU7PBZvD1q$$E4V=9Mm0NCStXqva0YHGe!0pT*F9({j+{g zXE#F%T~0?@Bj6xds**)<%)i<-13KL)W&&0q<~5bW7|~{$<$M@MUMBOC$I}(m3A~~L ztnMnv_-wJ8%Og%)!3PMTt&q|S;X5f$Rxq6?DJPWoSN7dyX?ET67<8!>?4$^guGK6k ze1*kgG4POJ06>X+(er)$MF@9MQ=posLrjKOYSP8G`SNl0emdc_NR`Kt!X`nHoiP&iEmIYvr# z2W2%lq7aeeF;Wk-B7gc-TOvk6&+)G9b6lpMJ#IjU*&ms}eC~1soBgbxkheU_iVbOh zgpm02hO7z+-lj%fdO(GFy>w@+IJ4z!U39kRJ6Bw~3 zNk&gGt->>!=_mEhbau%^lXWmnXC>#s05`3Jict!$pA*GpBI#4gnV2tBj|Ci$&Pxl1 zo($iBo5L-m&@@gxf#(zr2%MvM`EwHsShsy-jAWvpGrd3ws{b*U=789#>_sO56_qPyGoUhFYV~uIS=OV@MO9! zx^L+DfkDw`LR=l}!pE8=cfS2o>nCYaR}mbG8}zUb7#^STKWf$*|4(CA0hQIZb&>Aw z2I-J)>28ru>F)0CF6l-8x>{xs4xlnX` zr1Rz4_{cGE$(degrwhK|rK~G4ZbjTVPr6RRwod}d$q{F*6Dlkt&B4#Y5%!Ud5LuzX zzpQ!>i6|0daH+8t-N7h%|5_6mZH*sHxR0M6Xho2@1@y#n-9RK>b2Zu6gPEb?#A*;q zO)8D5U@|t7miWfek!woK_8nB;E~*-yME642O^MMx+}PDCFAK-J%ec~Ff+og_K#kxf zO1XNCi=b}Mue+{$mJHloM7K06E|K*e=V|wJHz&uN6dv=G`Jis?N>YMtLxPdH#Db&{ zc4uC{x~qiovzWUB7IiRyMIGnwhOSq(R;C7e_JEf)z&Fyw!0x9h{)xk6daR^uCm(9S z7#OIKJMXKmoTCm&MIWG}uvd!X1tEn=7#+M+qx zPvcm-aLl(lr7H)zs#NDg$8jR;j%`#;l5@CSPeSN?et0hf6ERZlwM$(=(xKhbS-^_YXCJObu}o^(n=DE{?*Pjh zGx@;hdbSQyDwj7##_m&d0)hS!rlpr1BEwgzdkc7_LVL-3qfvXLb5b|Ur12=T;E~8@ zkpYpoR6%b--tV;XUd{${QV<8d^jY-R^^%y0xPrpKD=VE3wf}5*s6{1t-7td(y;hqK zr=qy}30tWZFFbeIgdU&4tKST+^MeG8y9K^HsG`#f>UqyB!E*ggoi@*Oo3C9 zg{h(5-#U>OUOsU_Vl-E-lK>bmK>;Qhk>A_&rzZTqP#4s(GXPw~Hn6lau{Uuv__Hrk zp8Q`9u}tnX>$)*@H>y3M33SbQce;cT61oB;rUFyf&%o0R7c3kTd)qg?)_W3DZnWL6 zM6ph3aHL?sQ3R9Rc1Ig`N4cG@cFV2So-u!V2?8R^D7H`P!`&JWr(oY;nq|3O=;INn zFUdj0t{eQ8njH45jw>D(M{}p&X-fQ!YhR9)Jjt2^L?;hY#^gN(CISyt<_5p|P1V-T z1Mgt6BjLb)3Ms~#V1UXJrvos2_?^S_mA`uF!v#}#ERd%88 z?;i?rK}U9i4RPT_K!3}eg(78D5MBz92BADJqcn6W9m4y|0xF?S6$HO+5gFp{o=8%&v&J{)j zM-XzL{E2ScTHi$afKYam^Y$aIH{5o1CX_fPX%r+Ld20C#9U|A_ZFu*n)cx6lFJ(E> z%K#GD=Uq(njaXGmyU9q!S9Nlb)H^nDFJ+wQZD8t=hFWt{oN`jEka7v4OJ_X^$LjirV&Mm zIZXEBB>bJ%?H6Glf`Q#~?60(m4>AOY+u8D*$J&#HA*x%r>Gmd?oLEP*3td{tv&>f} zX{mjjyZZ_qfikx*1-4>1(azq#9NqPO`C^-Cn@MepI34~ICPCDU$;+sz`SK|e{L?L_ zoomorDb!GLPR*`34-J~S2oEtJD;KY zL!oaKp#7*exa4`Ng=A|j9q}`}?6&2z&NR}|?P`0^?bQa)S+ufjB4mb~vt?>q#DdYy zT7(MDd!Qv9nqC>ApEqL99oSdWYxLT=Ymh5($QmZx8yARiyy3yvb0;c~UKPfElO}rT zoELS-Vi|oxh19s%XC`zi>Apdbt_ueF2R9=HnLG!W?+InoI5l z>#cLO%C2pC{UCQ`+U#VWvEkwDc7{p+bp@J8YH`xx?(hS z+-z&HB2*`O8?fq`;rTav3X%`CsjM;Knb2k+^caHcjLdQ^OrhNhEh5zA+?exi{7q`G zIe0N6dT^TS1j^x=mVv>CN@m5T2eIcGm<+rZH4Uc+qr+bI4`FtAM%bG%q*t0=E}|7< z*D+7e(ydiBIUX)*U{YydM7Ah44NIXVDlXzcEs;2~FrYVI7<{1t zoB?J?fx4hbuxwFFGThURQvt$~u|YSCTBnjOSG=Im=8Z~$fU{WT7emET!-L&Tuae0i zEkIe6kbx1NtS*R7bE1g~3$Z1cq(Pc@n6&H=gD%MmQ;XfiS*JEpD*!1+{d~mGI2{Xa z@U%ONYZc!gTb@V9s?JErU0kBvUxJv9*DZQric&J^<6CoF^PWj_xlk|36h7;IGyEH< z5Afzd=|fIz>I2^0_#YGB$(4GORdsEIFvWL5c`=M&O=3@h8z3||ms-Oxf}d#ljE9nJ zDbt*0wR!s+qKtGdiV4&Wp~7=~FzK(T30Ao0pQV$6GqOannM-bEfT-uR&{Bp$ana(q zm}O$)CSxjU;);ve*@g>x7aOn2VZNy2V)vO39M}gr2DKOtVSB44mOnfVSW7uviKtaQ z2xnNveA$p0+NnuU2~(Qij@8`V_Kq}*6paQL+fSvNaiVl0RPO^v^7F93pf|1s+M{_4 z)o?Nw1#bCu)hI}oMrg=u!TN+3dtx;`p=5FW_-M62R;7bz12JEiYn8zDath6wXW-`N zO#+(;r}YB1u{zU3R(hmm`MAn>>MDZ{GzMzLe&>3}+PYBLUO40$sgd9YB}xLuvFm4n zVT1a5lIcz)ab3&P1*3ZkR0oE3)o5YTsa$qsQx~z>{8^}Ae4{7HAk@1mD`=k~e=|GMkN+s97yFIDC;U}vSl;KE#mPlMFRyS9)l@wqdhcP|63VBX z+dpLP9Kt=|t^uVDMbi3NZG!~+g+lxBjKMDd_u+U90N(ObCxP(-Oj=VJx z8)9acR!SYpoe-N|@5;HD|DcKkTPr5Obmf5HHL&h>%j0*7A^5Vx3G)jful}bl_x^Rd zDQ>8_>H1O@9+9J2Ex$+Qo$pXIUC3nN5EEIAmNJ+Xa|C|LIrFR1;ZLZ4-B z7{T%M%9V=s{pU^k_6JM3Y~?=wV&(CaaTgdCsL zT=pdH_Qoa>$r!B z%1{B@9%iNJYzVx)v)uGcihlQ{6i(1UB|9>_0|uLDrwtQkU{3n6A?8vDcxqVc(nh7B zzY6RbWtBp;fyfRyc*(JQ#2dC7I5~ZRf&4r-RtGIb9N@K99QoEz+SDNlIL|nw7Wu$% zQVsY~yjbJ@T|Y3vD)tr0PV3E;+jJk3tAch>IEYZ$a}fq7XKT*A0o{h%w6E45P;ZzM z^ETE!KIV$v?(gHhru*8mAK6nH$&UbaWz%AvRWio;UQw0Tb)44Auj!*vHu@lUITp%M zEVS{~dQ*kHbuuq8NK*$N+Lv|avUeBudAX0w0mXaFv$wrb$;Vw3{()^0@E#Z$dGFBR zXMryj=xq!jY7EWkj;Y?TJEJx%TlQj?tk_&;`87@8De;OV#&e>r-QpQuD>b%?ZUKat zJ*3gNIkgCnh@q$##%T$>KMvh&>;f?qd3`Uo$)+rF(;;M^pZbDJqaG} z^EQzUo8I2AtdKE!70H+c%Wgo$;;TKBb%^~OJ;A~tKi_cNdID_`L*gup@$(WDJLV+! zk|FSf@46_FNSYI0VU03)@_kD-2Y@V6nE3Ta98fC=?jD|rb+$2q>U? zo&K}o){6D#vSO}5?V;nUHGV0<{gPXG&LVW8mZ#kp!ZYo7k2W#NU;T<`*y(zL zJzvoMwX0{o)%XpzY{1%-pb`Ei`In4NC~oF6#GUJ@cVw!ZjT?|_VH=zHoQH@JfB-ch zo0QzlwY`VeSL4ixN6$Xk3%}aG-ljXrt}bq6H9(>;ge?6y_vL1%O`w$aLk>*Edj(of z$%!UzsMi&jZY`8e1EPgT^k_a!xYI$D<(a^r6ner`fOD|R&6iG(a|dyShA}sGq{S2# zCz_#FSyFPQk>l^F?h2v94bevrvKItiHV2KyIGRR`ogQX$1ic?Wm9)et8h?hBv9w+| zN;`-ar^qXGUP=8W)??)T1e59kRDx^h&T=5Y4{CdQNYt3pen4EAjls)5A0aOhaevU@ z96QqeWpz%_M+lM(4XTXD*Fb9#%#o}U3f<1Mnlcy@=xUP6(IH+-Ce#k{Oq$ZP_9&`i zl}bXYINXxQ7sz1y%{398;6>LILIkfN(sSsevLK`KWHQ9K8j^A}By2K7HJ8P>T%I3q zT1=0m+moK=72g0IZ-|=E@kXxo858iz&Ycz4WUl4o+<-L2c*(Mz6YMKJP_Oh7OdWH? zJ|N$7i&a?acPa0i-K>ho?c2Blw~9uaGv@O%b!7y+U`+=%k>5MKAlb(i9OVr_YaBN% zPPyc_w9HYKD4&|jn#%HPoefI=`fSz}x!vrR!xfwx;q5tBMK^=^C9V@A!h{>>-NtN3 zyRapmXoAen8#w}Qh}3Ix1`#>#%$QQv?pE&yC|3p_PCEu-tn#;wMET}Gkml=6I1;!L zATMaaG$7Jdw_$Z{=v0<>J9G(RzmlecHD@;lR!aNgwAN&`wPbG!)h;O>Q+`HmBoL55 zcQKrE1{qi`8u;Ld@p1g_D}MJW9k54DaA9^QI109UOh;^wFTD@Gn(g-Vy#WXV2iPnb zVKPEpGHCO#kUAV)i4VbS*BH(^+k_L!7ZxZRZ8u?25-)%@LC0t0J9Oh^1-_|`O!A5@ zmMrIFtq=3Md}TModF&*Wb||ey6;na|UT~{p;x2>uE`nHR(sy+hNOM%5KvF)df32x0 zY)KpibDsrPN@RHkcIdj_5*Uiwb~Ry}l#@9cwEyD0jWUJVG*B1v6+30CKYt5rDonr# zbcLK)aCke#z_u>EYRK@c`HRMfWza;2NlCt%7lf~mJ-zd9JY+DZL@%`+{mBrdWHDcQ z9LTkoS8TAC`l7zCP@8X)a0$KEnS`Fx?l>O1JoK;+k=!#PCfv?4j^_?@)Pe%fTOrve zt(gja=_@}iwN_Nz2@s7kzvQOvGGTkfrIAG)HrU>pDBpfwF zu@fVdy4RrNOB&9Nt(3ChE^%BRCbR%C-TgNb3gn5LNr5H#$S|OeM4=M}nis^@XCPrv zOmIX}P6SdU5>^mOWe6`Gz@A;%`A^(KCaw|r^9YQ)OOdM<)B}aAZMeIp?v6X%YTV(^ zOS z`OCEe6QE{thI=mmtLy2|nej`C&J{@(eZhE$DmXAtY}wZ)Hn8LK;0=#Ftznfc>+gF> z-p85vtO5d%LEdV3CVL9;iXh+Is@_2{TThs`K`gF{SRNgL-4#kOiKlQFTX1_NOrGxo zDXP!X(HovSKkwP%ewX)xZYbn#H_%g4)S97k&Jc7dzDKxWi}cjUdERJ!mXBeo-Xhdy5Z4F3^6%Y}gNJd*g6{Zc!vN~CAwb^6>Sk@pg%`GcnCtC&``7@d=i2%QN|bJ<`^MLR7@@xc5`1?TUbFG z1C-IbHN7gyufQI=y%c-CRJ|MZT8w6DLU5xCDn*QS#FGu^zSmQ2nIzAM&S4e;_2%8y z^}A37s^+&^Cw$1yR$*Xq>1LRL*LWw4@0bX`3Z}?<`B?De4DDG_5I@Mc(L2$G+rlsb z)KMAcg~ztuiwoQv$771lFr@myA{vkJdzJe-VjQ{W`8u+}`y)}6t+2xtc~94}s>s+{l$Sk5siC}DERoEcGE)D#hchx(gt z_rJV&C?W9(Eq9;Oni1uFoT>sAAz`2x-}4F08ldPYr` zo;BO49j&fqNdGMsB|}!M*BZ?FwwiIUAZ-|e?;ASlrxTXsOc=AUS>2-Dx+PxZgwbBF zMSUK-U2Qu3T1a-S4DRGMlYmQyFW#dFPG5qzkrX$uQ-Kzr4t7h$B!z1LmCqsKC|=g{B~CI{QIm!X1%jhQpS z9(%WgFx~-%Ey{kKtDhw4+p*ObW`=A%cT5Fe#d( z$+uR{(44e>(*+X9ew_;2Sj+toqYm$sI%~MMWNDYI(_t1=w;Nln+w9mdNUwgxJ(o&p z!9ZfFB}lJ7XRcgwTJPxpm~hH2;Q0Aqd114Sc8ekz(&^Znf9(|PpkwVD(jEB4MJt~$kYHQEza{V=v=1phbe5#-O3^C92N^Dk{=&bfr$g`-P;_0Jb5 z-!gOV2MV0Sm~`REEJ_hRn(}2-cz%s zW@o(5jcQmjI8q0b(-t%4V@xCstgcp}v2%$Y7Bwu&N?zval8oRDXNI<7ADk3JMQG$< z(&VT3Y+K3$*j|9wE0tF0N$*%tO1zyz7fWmuA{! z@QGumEOIoH{KAi8TY)dXHo$(J#gvZk71xrHNuGT-7%`rTlV_Zo!(OU-j%icv9_-KI z1nHQSr3ammbpfco?=Kl?ei@>EJ_17g>0S9U|fXm_LPN?1oEDA0!ut15`lj4Mm4xZU(wTeUNQEd zCE^6qv>v?G60wFbS<({Xk%G*#32rE?5^J1;{xx@AA#Akp0+j7jzL5B60@lV<+q#T9pQhKYEb9ArmLmLyiBO zplj;BiVS^~VaT8{hG|Ht#rRfNH3DN$?d98gb9u`7)O9^k;D`opoxd=)>$VRnWF{4= zgu@S?hwVK;ion71Q?M{fCP<6h8+9Z|>pD2wXq+ugvG1~%OlW9->&kCIjCuxVz*hX$ zzQ?iZehcS(p@nC2%$hQcBk?A>+~7f?i(MX9?(xp1mu9DyGM!72HSSfl z$Oz4QCzgy(V=oL3pQYF{Rx(Tx*~PbKFY*nBwbi=yuucV$ViM)}D3bSqy8 z88cp;2??o+fHgr1ilD6x(tjxLpv7V}g^jlHKGmPL=}$ey8ny4Ce(vkS=~F{6KE|Hw41~6<~g%~DzYSw1k;&|?j%Dl@2+$P=Xn^9hsFVRyG+Sh2H>*}g0F5Z3- z_(&dHcGwwx)K_QrW~r;^fw{0^ym(VVev=6Cqyz|SWK-F)LA{ecs}>LxqO}YTZ-!+( z;q?IN!|V*e1+fcZPiH1w{91m#?I0%~W9F{+g3vxq^=;nN2!9lnbn26nbT!P!@-_7L@R`X(Gl~k!p8%w(Grbc zXv1DpfF-8i*dE{5URa%j1YP2)HcOmon(g{XqKn(6_X3Msu0IcIPtB$L{5A_|SNkoE zZR(^u^A++I9BAg{utl6|;jyYf)sAW>t-#8D-_+*|1|FNcY2IH4uDJ9Tv=+eJObD2p zX?`ELesjwF`L;!by!!u3i`3QA9uwzjpz>2-WYZ3YVzj&}24x^J>3#?9XC=s`8u)Ee zrbY6C9wTeJ$qJE(7V-cb>5m<~$U_x(Pfq8!Pd{~E<6vrkbboxNjYLhU|LT>T6p^n0 z!X15P&Q4%xsyNNNXzz?(S{gDNbcpAN!OvZj6==wUn7d>c|OG>mhmic;2Yk$hZ=? zfd@%h+n~m5UDF91u)?AhThlL%(Ri569S6Spll1;NU?2si%D6$tk^|UxF*DY9)zD-z z#bv2vY)Pt@Nquvxvkhay!QRZu^^K|3=5+O4SI&{D_Z*LmH2nhdRQRUOps_EpJH=hf zCK$OVm|eW>q0~C{nqIERu*9DUb;(m2Up@A^1RChMCC=1#49=cpFG9 zTDi(`NBGuW)I?j;5BhPSt+-RujJefAYBF_T+%Lyx;Kihqw+s?2v5cE3M`KKS)!abNcTs%<>ORqL=?|OIG)!`0lzHMo!%wrs*NtjvZY09C-U@O)g!5^ zIv|SW4SR#gC4hkCK@ccUzOjciiS)(ys!-D=iP_h*P$4(-rms){9|dnFadD=P6926D z&_4EYGxjo`W&@&tD|SoAc03xlhl~MD%~=G=L^+P+Ty!sD-NA|aV>B7Z^R`z6IG+br zm<`>r?2QC_UsF)yT&&0Xg1oOp(Ep;B*n0~fu~7GcgW&Dslj*yzqrxr;@D&sRZnOR? zy^Fs-1AZqRTZ6wGV1ClOC{+ZkRpk)5>j7@pj+JQHp6d|0NKL5FEd2%0$P6TKDbvg! zyy}nDFzTB>p3FvxoH44xfj?~8yO@K-42c# zyTODmB@6do_d2|~LZIAqDG|?lSQQ;;& z2qsyVG8fmH)=I+;9-JeM`5YFwOY6gW1f6rh674zNkivf6fm}iIx!TA@%TXt;=5h#% zhH&FMx`&~+-1`gW*YDFa%wFOagiqkSE^sme?XvChu~&P+Eu8bpI4aP%YPX*niCBWw zLh95H>xi0I#FJn`mY?>0!e<(Uh!MgbLk59L*q!%*N5WZONmz)xU7&KGokQOuqcP>T z^WBbbgz=XtR)&$!ZiH+wmc7c@py~zA;D)V{6W(IV5n|y>@DM!0V}y9+lt<1q?ec~D zHH6p^c-d8DZlO4MT`;@)!6dDteVC6W=-d*^Rs-KG;SPz%n^9^c&LP|~%Fonsf*FWV zRbZQ~!sz=qR=*DX8Efw_NE;_yp)}UYRQ!jIM^nrF zPrP6{M;tf(&~L-3s}~ef`HZz4QfLKGXj6|DN(|0eadB8G-Y6`mNc1VeTdQ=NZA13; zxP6BBwSEOB&_5mkJR;ozJA!{DV<%u>Xk}|4Vq$A&FYloHz5f5&{q`tX$fGC&Zpl|! z+f*Bi!M&}U7xUxOg5)peLxe$!Mh>xvXPvK?R+*a7pIb05^2+ATe(W5r@k=PYQa8HG zd(7p{nX+@zgCwi?V3YsmWT+8vX})nR!|m$f^3;kB=$*}*Ue)3B978P;OgmgGEM#;8 znsqfG$%fIhkR%$r63BTtEJh`cS@4Qc8~I*vp0^Ca(vfN5h;{6raqF?}j!!RL?E`ga zjMUyL^t^T|Rx8q&kyou&l8;zPvox+(EG|>U5}*TIBA{a^k#+5QBg+19g;m4QG?jla zr5U>mOK0A6S|Y_klvZ&7c`(_awy9LDDTys2Hfsn`YvLp|p)OzDp?REw#eU>W2R zf<;j=LZV1py-9AsUM;_+(CLN@-gBl1a-Z|dL_HJU%aCpOWw4Zw2-5Pc;FcWtrg2nj z;WiqqjY+VgKF?qg)+DH0s%5zLKe{nKPpL6B#L8(s(u;;M?4puS3C6`e>5zhHL`&-m z_SI<_vI!z`A;#+Y*bH5F2G*Ad9XhWQ>@5C%9luRC={nqg&e=FAD&oa}^T~TsFbsM! z6^|iAUe1mxMU!dfE-jDOvniPm0#gR>lFf+ip%8Ffx3XVW*>w;PCiSgUc7r3mRv09vXIPkGMf9XhH(Tv7$mBMwFN>+AzLt{ z=42KviP zaUOT+uWYej2!0(y;()l4zj;=F0gTZczmL)KE_U_?7XQYkkRCfE(Zz=vI5uBwQCl}_ zIwQQyB7h>)9e@#yj`5oA)xKv6{!|PJ3fYvvs)VvH3_(W_GPwz2A%C}O8q@jM<49U# zi&snAvyNxxiG&Cd#OA2ks{SLu=4e^MgkFO$$;P1c7w@9^>W2EnvKEc-SEW{vLftrR z<6ocJg>ec}sW8iQm!wsAcgSVJEY*PFaT%+@GePJOPPC#dixOdhYo0Vs6BfU zF+g_4XgWE^5|RB&A4}nqX4VT4AJpmCcDo7)j>~nqA>feFoXsliWGa-mcK39AfD;EO z3965JmGA~=)OLP@)C_IVGoU9V*7=f z&|jOB7R}ff0??ez0Ams3?@jvCwENw$`nTofTlqDs$ycZkGL)z=b{)$K%qVQQ^sEQ& zOqkLnDM`^5P=*L@&3s)=@#=On_*-;HxM^~9hb#|z8|Q`WCp=?+Nt|)+R~br z=L4`cP@f3)5-a2UXpZR?mLttHEi+`Ya>hl@oWDY=jQ~B@hjG#pNA7)mt?>J@JBm9V zH;EN(!Y?S7F=@xZ`-x^ zJyYq=E{on)ESOyK?^JQ$Z#FO7+mqi0i>=T)%?Oj+xDkj<(|Y%k!<0=1N|mk!S{#aH zlE!EglG-Otpt?emg6s}%wZJZPn6kMc9n1V4X50#HxbE636>NHFsie4W7E=Re>*~0Vc z`P?TbYu=G}yC;OiEh?U${Y!gBRwxq8{oF9ajIHzOtPPNSRX5tHLB6WcUqCuTInCRu zd=`mb{rYSRhZ@}c!LTN7u)i`x7FeYWn2d>^0i3E*if=K^z|Z) zY)AJZ_K6RsH6DWQdJu)+n@G{Qqm;^#Qwu{b`C$ql8sq*E@lDBu-gl+R+n-T0FIX~} zGqR8ixFfdetrHEfD0vEXdTKaw1Mg`Fs)dN|F@Eh*mrm$fB(QL#lA5RDAK8LPdDuO?Edn1ymgP8JauL8ia(5RBBo%CCo)oza0?nX}4%^d9y?)UJ7fx<{5!OWA$XcNA{VpaTf zf!2~872Zo4OjH6LN#0z*y~55mvi`yM!1$12^wX(U(*lHp6D7|_tF5$t!E?C?RG z7lsJ5QR31rB(Ty=2@D2ZQdTKNWl&;_HH$4CXq3{Ot_!JZachGyEhRg|SW~ZRHCi+# zcaL1KSZ~)8B5-9ju<$)NR;tJgBm^We3})I|El@B%ML&Z*H2S=e-W8_Wv*C)dBNabJwTB#iE3yBOH{a zs%+ed!dTr;+a3ZtCmOBG zDaiz7_oKziODI+C9?c8II)EdJo@cl6TDGL|b0v%>tED>C<;y8kFP_T7W*netjkK^| zJ}4h_lJg5=eBDvs+0FX898KKl%86ZR)7xV=|Y1IaN2kfbHi9PvG~YY z7tDDDs+GVGF~BJ%dc__U=G`-)PmI-t)-)pW)f?P7n9MhG{SH|6hWbF`#^>(#A@kEI zzY2UzK2g8pL_;-%P4d$5hh|*pII)8@W!7WdhRt2?BM!9%n3`$>(0S^i^em4FA1){j zQMSepjX2$n6nhlF4N&z_xfke~Qu4-M-f8y?!|Rpp1}z9cHCO|^$ckD|>H#Z#&w(K@ zKWN$>z~BudL{0%Ra3e` zJ>Xma{vZM!^MCtOT3CUfR$N8|aP9urWOe2IQQt&}6ac?(Ir{r~=ksmv_n&0a{4(Mq z!tx3)q(y#4Sbstcn7h6|h(KTYQviQ|6F2&&6o5_8Pbu2Ir}!?1^iK%^0;E4B-2XM< z_ZSAhF&q2p8|DK3>kQ!c{Co0muNog*z-sCzA*R0p{tm44w{H5=9QCXQ%%TEjZEHZu zg?<72))@Z;_;ig1Sgkp`@H^NW1C(q{^nS=RKV{rKQn4!nFf9Ro#J?~)0`l+&M)AMP z@Yj~{DIRE{>xu>-uX2FYw7=kK11!IPz!SCA(Kk0x1c=FtSy>oJSy`DmSpONi99HIv z9$+}D1vK)vKKwg4C|3{8w20AknxVfa7iUEg(hEf!EE+<X!PXU!V1E|bj+erh^FaCfgU}a_hEr^D-w2p}-z=HZCbjH&zK;BOm)C=fMQGm>T z3xM$VQ{$5Wh?@5Y=&2NeSKJ@=-@%_Y<`V{_Yn2#Uuu{yuO{{;Je ztH|(sZ~RtoPXlWFK=su97pVUbUgK&0p9U`Y!Q^f5FPMII`vH{B`sXkPPpO{j#{Zx) zH~uH8|Dq!Q6#l6I`VV+u(|>~h-V*;LhyIl6sgmjsDiYg&LG@Rq{jchJDn|K(LxzEkDJ4svPwLQ_b_AFuym*U(kR3so%zrPI@RaB2mHi()AfdnU{NBX>>H_~$&Zifz ze{fcY|8LGe4_8k;WPf04Wd3i=KlsZ&&Gb`u#2*B&a{dLu&!g0zOYqbg><0l;-fskd z&l3N}jQg}CPn|b@5FHi%M)X^E{io0E>4EqU \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum -warn ( ) { +warn () { echo "$*" -} +} >&2 -die ( ) { +die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -81,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -89,81 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=$((i+1)) + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") -} -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then - cd "$(dirname "$0")" fi -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/src/main/java/org/broadinstitute/barclay/argparser/ArgumentDefinition.java b/src/main/java/org/broadinstitute/barclay/argparser/ArgumentDefinition.java index 1d49317b..c8e618d1 100644 --- a/src/main/java/org/broadinstitute/barclay/argparser/ArgumentDefinition.java +++ b/src/main/java/org/broadinstitute/barclay/argparser/ArgumentDefinition.java @@ -200,7 +200,7 @@ protected void intializeCollection(final String annotationType) { final Object callerArguments = containingObject; try { if (field.get(containingObject) == null) { - field.set(callerArguments, field.getType().newInstance()); + field.set(callerArguments, field.getType().getDeclaredConstructor().newInstance()); } } catch (final Exception ex) { // If we can't instantiate the collection, try falling back to Note: I assume this catches Exception to diff --git a/src/main/java/org/broadinstitute/barclay/argparser/CommandLinePluginProvider.java b/src/main/java/org/broadinstitute/barclay/argparser/CommandLinePluginProvider.java index fc584a7b..565e0763 100644 --- a/src/main/java/org/broadinstitute/barclay/argparser/CommandLinePluginProvider.java +++ b/src/main/java/org/broadinstitute/barclay/argparser/CommandLinePluginProvider.java @@ -1,6 +1,5 @@ package org.broadinstitute.barclay.argparser; -import java.util.ArrayList; import java.util.List; /** diff --git a/src/main/java/org/broadinstitute/barclay/argparser/LegacyCommandLineArgumentParser.java b/src/main/java/org/broadinstitute/barclay/argparser/LegacyCommandLineArgumentParser.java index fdaa262e..9ad75b46 100644 --- a/src/main/java/org/broadinstitute/barclay/argparser/LegacyCommandLineArgumentParser.java +++ b/src/main/java/org/broadinstitute/barclay/argparser/LegacyCommandLineArgumentParser.java @@ -880,7 +880,7 @@ private boolean isCollectionField(final Field field) { private void createCollection(final Field field, final Object callerOptions, final String annotationType) throws IllegalAccessException { try { - field.set(callerOptions, field.getType().newInstance()); + field.set(callerOptions, field.getType().getDeclaredConstructor().newInstance()); } catch (final Exception ex) { try { field.set(callerOptions, new ArrayList<>()); diff --git a/src/main/java/org/broadinstitute/barclay/help/BarclayDocletOption.java b/src/main/java/org/broadinstitute/barclay/help/BarclayDocletOption.java new file mode 100644 index 00000000..60b338de --- /dev/null +++ b/src/main/java/org/broadinstitute/barclay/help/BarclayDocletOption.java @@ -0,0 +1,74 @@ +package org.broadinstitute.barclay.help; + +import jdk.javadoc.doclet.Doclet; + +import java.util.List; + +/** + * Class to represent an individual Barclay doclet option. + */ +abstract public class BarclayDocletOption implements Doclet.Option { + // record to keep all of the components required for an option + private record DocletOptionRecord( + List aliases, + String description, + int argCount, + Doclet.Option.Kind kind, + String parameters) { } + private final DocletOptionRecord optionRecord; + + /** + * @param aliases list of aliases for this option + * @param description description for this option + * @param argCount number of arguments for this option, may be 0 + * @param kind the {@link Doclet.Option.Kind} for this option + * @param parameters {@link Doclet.Option} syntax describing the types of the option parameters + */ + public BarclayDocletOption(final List aliases, + final String description, + final int argCount, + final Doclet.Option.Kind kind, + final String parameters) { + optionRecord = new DocletOptionRecord(aliases, description, argCount, kind, parameters); + } + + /** + * A subclass to handle the common case of a STANDARD option of type string, with one argument + * and a single name with no aliases. + */ + public static abstract class SimpleStandardOption extends BarclayDocletOption { + public SimpleStandardOption(String name){ + super(List.of(name), name, 1, Kind.STANDARD, ""); + } + } + + @Override + public int getArgumentCount() { return optionRecord.argCount();} + + @Override + public String getDescription() { return optionRecord.description(); } + + @Override + public Kind getKind() { return optionRecord.kind(); } + + @Override + public List getNames() { return optionRecord.aliases(); } + + @Override + public String getParameters() { return optionRecord.parameters(); } + + @Override + public int hashCode() { + return optionRecord.hashCode(); + } + + @Override + public boolean equals(Object obj) { + return optionRecord.equals(obj); + } + + @Override + public String toString() { + return optionRecord.toString(); + } +} diff --git a/src/main/java/org/broadinstitute/barclay/help/BarclayDocletOptions.java b/src/main/java/org/broadinstitute/barclay/help/BarclayDocletOptions.java new file mode 100644 index 00000000..2062ee43 --- /dev/null +++ b/src/main/java/org/broadinstitute/barclay/help/BarclayDocletOptions.java @@ -0,0 +1,22 @@ +package org.broadinstitute.barclay.help; + +/** + * Constants for the Barclay options. + */ +public class BarclayDocletOptions { + + // Builtin javadoc command line arguments + final static String DESTINATION_DIR_OPTION = "-d"; + final static String WINDOW_TITLE_OPTION = "-windowtitle"; + final static String DOC_TITLE_OPTION = "-doctitle"; + final static String QUIET_OPTION = "-quiet"; + + // Barclay HelpDoclet custom command line options + final static String SETTINGS_DIR_OPTION = "-settings-dir"; + final static String BUILD_TIMESTAMP_OPTION = "-build-timestamp"; + final static String ABSOLUTE_VERSION_OPTION = "-absolute-version"; + final static String INCLUDE_HIDDEN_OPTION = "-hidden-version"; + final static String OUTPUT_FILE_EXTENSION_OPTION = "-output-file-extension"; + final static String INDEX_FILE_EXTENSION_OPTION = "-index-file-extension"; + final static String USE_DEFAULT_TEMPLATES_OPTION = "-use-default-templates"; +} diff --git a/src/main/java/org/broadinstitute/barclay/help/BashTabCompletionDoclet.java b/src/main/java/org/broadinstitute/barclay/help/BashTabCompletionDoclet.java index f64f6835..f100fb4c 100644 --- a/src/main/java/org/broadinstitute/barclay/help/BashTabCompletionDoclet.java +++ b/src/main/java/org/broadinstitute/barclay/help/BashTabCompletionDoclet.java @@ -1,12 +1,11 @@ package org.broadinstitute.barclay.help; -import com.sun.javadoc.ClassDoc; -import com.sun.javadoc.RootDoc; import freemarker.template.Configuration; import freemarker.template.Template; import freemarker.template.TemplateException; import org.broadinstitute.barclay.argparser.CommandLineProgramProperties; +import javax.lang.model.element.Element; import java.io.*; import java.util.*; import java.util.stream.Collectors; @@ -34,17 +33,17 @@ public class BashTabCompletionDoclet extends HelpDoclet { final private static String CALLER_SCRIPT_NAME = "-caller-script-name"; - final private static String CALLER_SCRIPT_PREFIX_LEGAL_ARGS = "-caller-pre-legal-args"; - final private static String CALLER_SCRIPT_PREFIX_ARG_VALUE_TYPES = "-caller-pre-arg-val-types"; - final private static String CALLER_SCRIPT_PREFIX_MUTEX_ARGS = "-caller-pre-mutex-args"; - final private static String CALLER_SCRIPT_PREFIX_ALIAS_ARGS = "-caller-pre-alias-args"; + final private static String CALLER_SCRIPT_PREFIX_LEGAL_ARGS = "-caller-pre-legal-args"; + final private static String CALLER_SCRIPT_PREFIX_ARG_VALUE_TYPES = "-caller-pre-arg-val-types"; + final private static String CALLER_SCRIPT_PREFIX_MUTEX_ARGS = "-caller-pre-mutex-args"; + final private static String CALLER_SCRIPT_PREFIX_ALIAS_ARGS = "-caller-pre-alias-args"; final private static String CALLER_SCRIPT_PREFIX_ARG_MIN_OCCURRENCES = "-caller-pre-arg-min-occurs"; final private static String CALLER_SCRIPT_PREFIX_ARG_MAX_OCCURRENCES = "-caller-pre-arg-max-occurs"; - final private static String CALLER_SCRIPT_POSTFIX_LEGAL_ARGS = "-caller-post-legal-args"; - final private static String CALLER_SCRIPT_POSTFIX_ARG_VALUE_TYPES = "-caller-post-arg-val-types"; - final private static String CALLER_SCRIPT_POSTFIX_MUTEX_ARGS = "-caller-post-mutex-args"; - final private static String CALLER_SCRIPT_POSTFIX_ALIAS_ARGS = "-caller-post-alias-args"; + final private static String CALLER_SCRIPT_POSTFIX_LEGAL_ARGS = "-caller-post-legal-args"; + final private static String CALLER_SCRIPT_POSTFIX_ARG_VALUE_TYPES = "-caller-post-arg-val-types"; + final private static String CALLER_SCRIPT_POSTFIX_MUTEX_ARGS = "-caller-post-mutex-args"; + final private static String CALLER_SCRIPT_POSTFIX_ALIAS_ARGS = "-caller-post-alias-args"; final private static String CALLER_SCRIPT_POSTFIX_ARG_MIN_OCCURRENCES = "-caller-post-arg-min-occurs"; final private static String CALLER_SCRIPT_POSTFIX_ARG_MAX_OCCURRENCES = "-caller-post-arg-max-occurs"; @@ -60,172 +59,184 @@ public class BashTabCompletionDoclet extends HelpDoclet { /** * Arguments to the executable / wrapper script that come before any Java class names / tools. - * + *

* This is expected to be a space-delimited string with the options themselves as they should be * typed by the user. - * + *

* This syntax is used to pass this information to directly to the bash completion script. - * + *

* Example: {@code "--help --info --list --inputFile --outFolder --memSize --multiplier"} */ - private String callerScriptPrefixLegalArgs = ""; + private String callerScriptPrefixLegalArgs = ""; /** * Types of the arguments that the executable / wrapper script is expecting before any Java class names / tools. - * The order of these space-delimited types should correspond to the contents of {@link #callerScriptPrefixLegalArgs} - * + * The order of these space-delimited types should correspond to the contents of + * {@link #callerScriptPrefixLegalArgs} + *

* This is expected to be a space-delimited string of types. - * + *

* Currently accepted type values are the following (not case-sensitive): - * - * {@code file} - * {@code folder} - * {@code directory} - * {@code int} - * {@code long} - * {@code double} - * {@code float} - * {@code null} (to be used in the case of an argument that acts as a flag [i.e. one that takes no additional input]) - * + *

+ * {@code file} + * {@code folder} + * {@code directory} + * {@code int} + * {@code long} + * {@code double} + * {@code float} + * {@code null} (to be used in the case of an argument that acts as a flag [i.e. one that takes no additional + * input]) + *

* This syntax is used to pass this information to directly to the bash completion script. - * + *

* Example: {@code "null null null file directory int double"} */ - private String callerScriptPrefixArgValueTypes = ""; + private String callerScriptPrefixArgValueTypes = ""; /** * Sets of arguments to the executable / wrapper script that are mutually exclusive to each other and * are expected before any Java class names / tools. - * + *

* This is expected to be a string with mutex information for each argument that is mutually exclusive with another * argument. The format for this string is: - * + *

* {@code FOO;mutexToFoo1[,mutexToFoo2][,mutexToFoo3]... BAR;mutexToBar1[,mutexToBar2][,mutexToBar3]... } - * - * where: - * + *

+ * where: + *

* {@code FOO} is an argument to the wrapper script which is expected before any Java class names / tools - * {@code mutexToFoo1} is an argument with which {@code FOO} is mutually exclusive without leading decorators (usually - or --) - * {@code mutexToFoo2} is an argument with which {@code FOO} is mutually exclusive without leading decorators (usually - or --) - * {@code mutexToFoo3} is an argument with which {@code FOO} is mutually exclusive without leading decorators (usually - or --) - * and + * {@code mutexToFoo1} is an argument with which {@code FOO} is mutually exclusive without leading decorators + * (usually - or --) + * {@code mutexToFoo2} is an argument with which {@code FOO} is mutually exclusive without leading decorators + * (usually - or --) + * {@code mutexToFoo3} is an argument with which {@code FOO} is mutually exclusive without leading decorators + * (usually - or --) + * and * {@code BAR} is an argument to the wrapper script which is expected before any Java class names / tools - * {@code mutexToBar1} is an argument with which {@code BAR} is mutually exclusive without leading decorators (usually - or --) - * {@code mutexToBar2} is an argument with which {@code BAR} is mutually exclusive without leading decorators (usually - or --) - * {@code mutexToBar3} is an argument with which {@code BAR} is mutually exclusive without leading decorators (usually - or --) - * + * {@code mutexToBar1} is an argument with which {@code BAR} is mutually exclusive without leading decorators + * (usually - or --) + * {@code mutexToBar2} is an argument with which {@code BAR} is mutually exclusive without leading decorators + * (usually - or --) + * {@code mutexToBar3} is an argument with which {@code BAR} is mutually exclusive without leading decorators + * (usually - or --) + *

* This can be thought of as a set of such argument relationships and does not have any ordering scheme. - * + *

* This syntax is used to pass this information to directly to the bash completion script. - * + *

* Example: {@code "--help;info,list,inputFile --info;help,list,inputFile"} */ - private String callerScriptPrefixMutexArgs = ""; + private String callerScriptPrefixMutexArgs = ""; /** * Sets of arguments to the executable / wrapper script that are aliases of each other and * are expected before any Java class names / tools. * For example, full argument names and short names for those arguments. - * + *

* This is expected to be a string with alias information for each argument that is an alias of another * argument. The format for this string is: - * + *

* {@code FOO;aliasToFoo1[,aliasToFoo2][,aliasToFoo3]... BAR;aliasToBar1[,aliasToBar2][,aliasToBar3]... } - * - * where: - * + *

+ * where: + *

* {@code FOO} is an argument to the wrapper script which is expected before any Java class names / tools * {@code aliasToFoo1} is an argument which is an alias to {@code FOO} * {@code aliasToFoo2} is an argument which is an alias to {@code FOO} * {@code aliasToFoo3} is an argument which is an alias to {@code FOO} - * and + * and * {@code BAR} is an argument to the wrapper script which is expected before any Java class names / tools * {@code aliasToBar1} is an argument which is an alias to {@code BAR} * {@code aliasToBar2} is an argument which is an alias to {@code BAR} * {@code aliasToBar3} is an argument which is an alias to {@code BAR} - * + *

* This can be thought of as a set of such argument relationships and does not have any ordering scheme. - * + *

* This syntax is used to pass this information to directly to the bash completion script. - * + *

* Example: {@code "--help;-h --info;-i --inputFile;-if,-infile,-inny"} */ - private String callerScriptPrefixAliasArgs = ""; + private String callerScriptPrefixAliasArgs = ""; /** * The minimum number of occurrences of each argument that the executable / wrapper script is expecting * before any Java class names / tools. * This is expected to be a space-delimited string with the min occurrences as {@code integer} values. - * - * The order of these space-delimited values should correspond to the contents of {@link #callerScriptPrefixLegalArgs} - * + *

+ * The order of these space-delimited values should correspond to the contents of + * {@link #callerScriptPrefixLegalArgs} + *

* This is used in the logic that tracks the number of times an option is specified. - * + *

* This syntax is used to pass this information to directly to the bash completion script. - * + *

* Example: {@code "0 0 0 1 1 0 0 0"} */ - private String callerScriptPrefixMinOccurrences = ""; + private String callerScriptPrefixMinOccurrences = ""; /** * The maximum number of occurrences of each argument that the executable / wrapper script is expecting * before any Java class names / tools. * This is expected to be a space-delimited string with the max occurrences as {@code integer} values. - * - * The order of these space-delimited values should correspond to the contents of {@link #callerScriptPrefixLegalArgs} - * + *

+ * The order of these space-delimited values should correspond to the contents of + * {@link #callerScriptPrefixLegalArgs} + *

* This is used in the logic that tracks the number of times an option is specified. - * + *

* This syntax is used to pass this information to directly to the bash completion script. - * + *

* Example: {@code "1 1 1 1 1 1 1 1"} */ - private String callerScriptPrefixMaxOccurrences = ""; + private String callerScriptPrefixMaxOccurrences = ""; /** * Arguments to the executable / wrapper script that come after any Java class names / tools. The start of these * options is indicated by the user inputting the special option {@code --} - * + *

* The format of this variable is identical to {@link #callerScriptPrefixLegalArgs} */ - private String callerScriptPostfixLegalArgs = ""; + private String callerScriptPostfixLegalArgs = ""; /** * Types of the arguments that the executable / wrapper script is expecting after any Java class * names / tools. The start of these options is indicated by the user inputting the special option {@code --} - * - * The order of these space-delimited types should correspond to the contents of {@link #callerScriptPostfixLegalArgs} - * + *

+ * The order of these space-delimited types should correspond to the contents of + * {@link #callerScriptPostfixLegalArgs} + *

* The format of this variable is identical to {@link #callerScriptPrefixArgValueTypes} */ - private String callerScriptPostfixArgValueTypes = ""; + private String callerScriptPostfixArgValueTypes = ""; /** * Sets of arguments to the executable / wrapper script that are mutually exclusive to each other and * are expected after any Java class names / tools. The start of these options is indicated by the user * inputting the special option {@code --} - * + *

* The format of this variable is identical to {@link #callerScriptPrefixMutexArgs} */ - private String callerScriptPostfixMutexArgs = ""; + private String callerScriptPostfixMutexArgs = ""; /** * Sets of arguments to the executable / wrapper script that are aliases of each other and * are expected after any Java class names / tools. The start of these options is indicated by the user * inputting the special option {@code --} - * + *

* The format of this variable is identical to {@link #callerScriptPrefixAliasArgs} */ - private String callerScriptPostfixAliasArgs = ""; + private String callerScriptPostfixAliasArgs = ""; /** * The minimum number of occurrences of each argument that the executable / wrapper script is expecting * after any Java class names / tools. The start of these options is indicated by the user * inputting the special option {@code --} - * - * The order of these space-delimited types should correspond to the contents of {@link #callerScriptPostfixLegalArgs} - * + *

+ * The order of these space-delimited types should correspond to the contents of + * {@link #callerScriptPostfixLegalArgs} + *

* The format of this variable is identical to {@link #callerScriptPrefixMinOccurrences} */ private String callerScriptPostfixMinOccurrences = ""; @@ -234,9 +245,10 @@ public class BashTabCompletionDoclet extends HelpDoclet { * The maximum number of occurrences of each argument that the executable / wrapper script is expecting * after any Java class names / tools. The start of these options is indicated by the user * inputting the special option {@code --} - * - * The order of these space-delimited types should correspond to the contents of {@link #callerScriptPostfixLegalArgs} - * + *

+ * The order of these space-delimited types should correspond to the contents of + * {@link #callerScriptPostfixLegalArgs} + *

* The format of this variable is identical to {@link #callerScriptPrefixMaxOccurrences} */ private String callerScriptPostfixMaxOccurrences = ""; @@ -246,21 +258,14 @@ public class BashTabCompletionDoclet extends HelpDoclet { * The start of these options is indicated by the user inputting the special option {@code --} * The value of this is set internally based on the contents of {@link #callerScriptPostfixLegalArgs} */ - private boolean hasCallerScriptPostfixArgs = false; + private boolean hasCallerScriptPostfixArgs = false; // ============================================= - public static boolean start(RootDoc rootDoc) { - try { - return new BashTabCompletionDoclet().startProcessDocs(rootDoc); - } catch (IOException e) { - throw new DocException("Exception processing javadoc", e); - } - } - private String quoteEachWord(final String sentence) { return quoteEachWord(sentence, " "); } + private String quoteEachWord(final String sentence, final String sep) { return Stream.of(sentence.split(sep)) @@ -268,33 +273,9 @@ private String quoteEachWord(final String sentence, final String sep) { .collect(Collectors.joining(sep)); } - // Must add options that are applicable to this doclet so that they will be accepted. - public static int optionLength(final String option) { - - if (option.equals(CALLER_SCRIPT_NAME) || - option.equals(CALLER_SCRIPT_PREFIX_LEGAL_ARGS) || - option.equals(CALLER_SCRIPT_PREFIX_ARG_VALUE_TYPES) || - option.equals(CALLER_SCRIPT_PREFIX_MUTEX_ARGS) || - option.equals(CALLER_SCRIPT_PREFIX_ALIAS_ARGS) || - option.equals(CALLER_SCRIPT_PREFIX_ARG_MIN_OCCURRENCES) || - option.equals(CALLER_SCRIPT_PREFIX_ARG_MAX_OCCURRENCES) || - option.equals(CALLER_SCRIPT_POSTFIX_LEGAL_ARGS) || - option.equals(CALLER_SCRIPT_POSTFIX_ARG_VALUE_TYPES) || - option.equals(CALLER_SCRIPT_POSTFIX_MUTEX_ARGS) || - option.equals(CALLER_SCRIPT_POSTFIX_ALIAS_ARGS) || - option.equals(CALLER_SCRIPT_POSTFIX_ARG_MIN_OCCURRENCES) || - option.equals(CALLER_SCRIPT_POSTFIX_ARG_MAX_OCCURRENCES) ) - { - return 2; - } - else { - return HelpDoclet.optionLength(option); - } - } - @Override protected void validateDocletStartingState() { - if ( callerScriptName == null ) { + if (callerScriptName == null) { // The user did not specify the caller script name. // We cannot function under these conditions: throw new RuntimeException("ERROR: You must specify a caller script name using the option: " + CALLER_SCRIPT_NAME); @@ -302,101 +283,140 @@ protected void validateDocletStartingState() { } @Override - protected boolean parseOption(final String[] option) { + public Set

Note: Custom Barclay doclets should subclass this class, and implement a similar static - * method that creates an instance of the doclet subclass and delegates to that instance's - * {@link #startProcessDocs(RootDoc)}. - */ - public static boolean start(final RootDoc rootDoc) throws IOException { - return new HelpDoclet().startProcessDocs(rootDoc); - } - - /** - * Ensure that {@link #settingsDir} exists and is a directory. - * Throws a {@link RuntimeException} if {@link #settingsDir} is invalid. - */ - private void validateSettingsDir() { - if (!settingsDir.exists()) { - throw new RuntimeException(SETTINGS_DIR_OPTION + " : " + settingsDir.getPath() + " does not exist!"); - } - else if (!settingsDir.isDirectory()) { - throw new RuntimeException(SETTINGS_DIR_OPTION + " : " + settingsDir.getPath() + " is not a directory!"); - } - } - - /** - * This method exists to allow child classes to do input argument / state checking. - * Designed to be overridden in child classes. - * - * Child classes should do internal validation and throw if there are issues. - */ - protected void validateDocletStartingState() { + private DocletEnvironment docletEnv; // The javadoc doclet env + protected Set workUnits = new LinkedHashSet<>(); // Set of all things we are going to document + private Reporter reporter; + @Override + public void init(final Locale locale, final Reporter reporter) { + this.reporter = reporter; } - /** - * Extracts the contents of certain types of javadoc and adds them to an output file. - * - * @param rootDoc The documentation root. - * @return Whether the JavaDoc run succeeded. - * @throws java.io.IOException if output can't be written. - */ - protected boolean startProcessDocs(final RootDoc rootDoc) throws IOException { - for (String[] options : rootDoc.options()) { - parseOption(options); - } + @Override + public String getName() { + return getClass().getName(); + } + @Override + public boolean run(final DocletEnvironment docEnv) { // Make sure the user specified a settings directory OR that we should use the defaults. // Both are not allowed. // Neither are not allowed. if ( (useDefaultTemplates && isSettingsDirSet) || (!useDefaultTemplates && !isSettingsDirSet)) { - throw new RuntimeException("ERROR: must specify only ONE of: " + USE_DEFAULT_TEMPLATES_OPTION + " , " + SETTINGS_DIR_OPTION); + throw new RuntimeException("ERROR: must specify only ONE of: " + BarclayDocletOptions.USE_DEFAULT_TEMPLATES_OPTION + " , " + BarclayDocletOptions.SETTINGS_DIR_OPTION); } + this.docletEnv = docEnv; + // Make sure we can use the directory for settings we have set: if (!useDefaultTemplates) { validateSettingsDir(); @@ -157,109 +110,183 @@ protected boolean startProcessDocs(final RootDoc rootDoc) throws IOException { // Make sure we're in a good state to run: validateDocletStartingState(); - - - processDocs(rootDoc); + processDocs(docEnv); return true; } - /** - * Handles javadoc command line options. The first entry in the {@code options} array is the - * option name. Subsequent entries contain the option's arguments, the number of which is - * determined by the value returned from {@link #optionLength(String)} for that option. - * - *

Custom Barclay doclets that want to have custom command line options should override this - * method, and also provide an implementation of the static method {@link #optionLength}). - * Both methods should handle the custom options, and then delegate back to the base class - * methods defined here to allow default handling of builtin options. - * - * @param options Options to parse. - * @return True if {@code options} was parsed, False otherwise. - */ - protected boolean parseOption(final String[] options) { + @Override + public Set getSupportedOptions() { + return new LinkedHashSet<>() {{ - boolean hasParsedOption = false; + // standard javadoc options - if (options[0].equals(SETTINGS_DIR_OPTION)) { - settingsDir = new File(options[1]); - isSettingsDirSet = true; - hasParsedOption = true; - } - else if (options[0].equals(DESTINATION_DIR_OPTION)) { - destinationDir = new File(options[1]); - hasParsedOption = true; - } - else if (options[0].equals(BUILD_TIMESTAMP_OPTION)) { - buildTimestamp = options[1]; - hasParsedOption = true; - } - else if (options[0].equals(ABSOLUTE_VERSION_OPTION)) { - absoluteVersion = options[1]; - hasParsedOption = true; - } - else if (options[0].equals(INCLUDE_HIDDEN_OPTION)) { - showHiddenFeatures = true; - hasParsedOption = true; - } - else if (options[0].equals(OUTPUT_FILE_EXTENSION_OPTION)) { - outputFileExtension = options[1]; - hasParsedOption = true; - } - else if (options[0].equals(INDEX_FILE_EXTENSION_OPTION)) { - indexFileExtension = options[1]; - hasParsedOption = true; - } - else if (options[0].equals(USE_DEFAULT_TEMPLATES_OPTION)) { - useDefaultTemplates = true; - hasParsedOption = true; - } + add(new BarclayDocletOption.SimpleStandardOption(BarclayDocletOptions.DESTINATION_DIR_OPTION) { + @Override + public boolean process(String option, List arguments) { + destinationDir = new File(arguments.get(0)); + return true; + } + }); + + add(new BarclayDocletOption.SimpleStandardOption(BarclayDocletOptions.WINDOW_TITLE_OPTION) { + @Override + public boolean process(String option, List arguments) { + return true; + } + }); + + add(new BarclayDocletOption.SimpleStandardOption(BarclayDocletOptions.DOC_TITLE_OPTION) { + @Override + public boolean process(String option, List arguments) { + return true; + } + }); + + add(new BarclayDocletOption( + Arrays.asList(BarclayDocletOptions.QUIET_OPTION), + "quiet", + 0, + Option.Kind.STANDARD, + null) { + @Override + public boolean process(String option, List arguments) { + // the gradle javadoc task includes this since its a standard doclet arg + // so we need to tolerate it, but ignore it + return true; + } + }); + + add(new BarclayDocletOption( + Arrays.asList(BarclayDocletOptions.SETTINGS_DIR_OPTION), + "settings dir", + 1, + Option.Kind.STANDARD, + "") { + @Override + public boolean process(String option, List arguments) { + settingsDir = new File(arguments.get(0)); + isSettingsDirSet = true; + return true; + } + }); + + // custom Barclay options + + add(new BarclayDocletOption( + Arrays.asList(BarclayDocletOptions.BUILD_TIMESTAMP_OPTION), + "build timestamp", + 1, + Option.Kind.OTHER, + "") { + @Override + public boolean process(String option, List arguments) { + buildTimestamp = arguments.get(0); + return true; + } + }); + add(new BarclayDocletOption( + Arrays.asList(BarclayDocletOptions.ABSOLUTE_VERSION_OPTION), + "absolute version", + 1, + Option.Kind.OTHER, + "") { + @Override + public boolean process(String option, List arguments) { + absoluteVersion = arguments.get(0); + return true; + } + }); + add(new BarclayDocletOption( + Arrays.asList(BarclayDocletOptions.OUTPUT_FILE_EXTENSION_OPTION), + "output file extension", + 1, + Option.Kind.OTHER, + "") { + @Override + public boolean process(String option, List arguments) { + outputFileExtension = arguments.get(0); + return true; + } + }); + add(new BarclayDocletOption( + Arrays.asList(BarclayDocletOptions.INDEX_FILE_EXTENSION_OPTION), + "index file extension", + 1, + Option.Kind.OTHER, + "") { + @Override + public boolean process(String option, List arguments) { + indexFileExtension = arguments.get(0); + return true; + } + }); + add(new BarclayDocletOption( + Arrays.asList(BarclayDocletOptions.INCLUDE_HIDDEN_OPTION), + "hidden features", + 0, + Option.Kind.OTHER, + null) { + @Override + public boolean process(String option, List arguments) { + showHiddenFeatures = true; + return true; + } + }); + add(new BarclayDocletOption( + Arrays.asList(BarclayDocletOptions.USE_DEFAULT_TEMPLATES_OPTION), + "use default templates", + 0, + Option.Kind.OTHER, + null) { + @Override + public boolean process(String option, List arguments) { + useDefaultTemplates = true; + return true; + } + }); + }}; + } - return hasParsedOption; + @Override + public SourceVersion getSupportedSourceVersion() { + return SourceVersion.RELEASE_17; } + /** - * Validates the given options against options supported by this doclet. - * - *

Custom Barclay doclets that want to have custom command line options should provide an - * implementation of this static method, and also override override {@link #parseOption}). - * Both methods should handle the custom options, delegating back to the base class methods - * defined here to allow default handling of builtin options. + * Ensure that {@link #settingsDir} exists and is a directory. + * Throws a {@link RuntimeException} if {@link #settingsDir} is invalid. + */ + private void validateSettingsDir() { + if (!settingsDir.exists()) { + throw new RuntimeException(BarclayDocletOptions.SETTINGS_DIR_OPTION + " : " + settingsDir.getPath() + " does not exist!"); + } + else if (!settingsDir.isDirectory()) { + throw new RuntimeException(BarclayDocletOptions.SETTINGS_DIR_OPTION + " : " + settingsDir.getPath() + " is not a directory!"); + } + } + + /** + * This method exists to allow child classes to do input argument / state checking. + * Designed to be overridden in child classes. * - * @param option Option to validate. - * @return Number of potential parameters; 0 if not supported. + * Child classes should do internal validation and throw if there are issues. */ - public static int optionLength(final String option) { - // Any arguments used for the doclet need to be recognized here. Many javadoc plugins (ie. gradle) - // automatically add some such as "-doctitle", "-windowtitle", which we ignore. - if (option.equals(DOC_TITLE_OPTION) || - option.equals(WINDOW_TITLE_OPTION) || - option.equals(SETTINGS_DIR_OPTION) || - option.equals(DESTINATION_DIR_OPTION) || - option.equals(BUILD_TIMESTAMP_OPTION) || - option.equals(ABSOLUTE_VERSION_OPTION) || - option.equals(OUTPUT_FILE_EXTENSION_OPTION) || - option.equals(INDEX_FILE_EXTENSION_OPTION)) { - return 2; - } else if (option.equals(QUIET_OPTION) || - option.equals(USE_DEFAULT_TEMPLATES_OPTION)) { - return 1; - } else { - logger.error("The Javadoc command line option is not recognized by the Barclay doclet: " + option); - return 0; - } + protected void validateDocletStartingState() { + } /** - * Process the classes that have been included by the javadoc process in the rootDoc object. + * Process the classes that have been included by the javadoc process. * - * @param rootDoc root structure containing the the set of objects accumulated by the javadoc process + * @param docletEnv the Doclet's DocletEnvironment */ - private void processDocs(final RootDoc rootDoc) { - this.rootDoc = rootDoc; + private void processDocs(final DocletEnvironment docletEnv) { + this.docletEnv = docletEnv; - // Get a list of all the features and groups that we'll actually retain - workUnits = computeWorkUnits(); + // scan all included elements for DocumentedFeatures + workUnits = JavaLanguageModelScanners.getWorkUnits(this, docletEnv, reporter, docletEnv.getIncludedElements()); - final Set uniqueGroups = new HashSet<>(); + final Set uniqueGroups = new LinkedHashSet<>(); final List> featureMaps = new ArrayList<>(); final List> groupMaps = new ArrayList<>(); @@ -274,46 +301,14 @@ private void processDocs(final RootDoc rootDoc) { } ); - // Second pass: populate the property map for each work unit + // Second pass: populate the property map for each work unit workUnits.stream().forEach(workUnit -> { workUnit.processDoc(featureMaps, groupMaps); }); // Third pass: Generate the individual outputs for each work unit, and the top-level index file emitOutputFromTemplates(groupMaps, featureMaps); } - - /** - * For each class in the rootDoc class list, delegate to the appropriate DocWorkUnitHandler to - * determine if it should be included in this run, and for each included feature, construct a DocWorkUnit. - * - * @return the set of all DocWorkUnits for which we are actually generating docs - */ - private Set computeWorkUnits() { - final TreeSet workUnits = new TreeSet<>(); - - for (final ClassDoc classDoc : rootDoc.classes()) { - final Class clazz = getClassForClassDoc(classDoc); - final DocumentedFeature documentedFeature = getDocumentedFeatureForClass(clazz); - - if (documentedFeature != null) { - if (documentedFeature.enable() && includeInDocs(documentedFeature, classDoc, clazz)) { - DocWorkUnit workUnit = createWorkUnit( - documentedFeature, - classDoc, - clazz); - if (workUnit != null) { - workUnits.add(workUnit); - } - } else { - logger.info("Skipping disabled documentation for feature: " + classDoc); - } - } - } - - return workUnits; - } - - public RootDoc getRootDoc() { return rootDoc; } + public DocletEnvironment getDocletEnv() { return docletEnv; } public String getBuildTimeStamp() { return buildTimestamp; } @@ -354,11 +349,10 @@ private Set computeWorkUnits() { * to determine if a DocWorkUnit should be created for this feature. * * @param documentedFeature feature that is being considered for inclusion in the docs - * @param classDoc for the class that is being considered for inclusion in the docs * @param clazz class that is being considered for inclusion in the docs * @return true if the doc should be included, otherwise false */ - public boolean includeInDocs(final DocumentedFeature documentedFeature, final ClassDoc classDoc, final Class clazz) { + public boolean includeInDocs(final DocumentedFeature documentedFeature, final Class clazz) { boolean hidden = !showHiddenFeatures() && clazz.isAnnotationPresent(Hidden.class); return !hidden && JVMUtils.isConcrete(clazz); } @@ -407,50 +401,17 @@ private void emitOutputFromTemplates ( * Create a work unit and handler capable of documenting the feature specified by the input arguments. * Returns null if no appropriate handler is found or doc shouldn't be documented at all. */ - protected DocWorkUnit createWorkUnit( - final DocumentedFeature documentedFeature, - final ClassDoc classDoc, - final Class clazz) + public DocWorkUnit createWorkUnit( + final Element classElement, + final Class clazz, + final DocumentedFeature documentedFeature) { return new DocWorkUnit( new DefaultDocWorkUnitHandler(this), - documentedFeature, - classDoc, - clazz); - } - - /** - * Returns the instantiated DocumentedFeature that describes the doc for this class. - * - * @param clazz - * @return DocumentedFeature, or null if this classDoc shouldn't be included/documented - */ - private DocumentedFeature getDocumentedFeatureForClass(final Class clazz) { - if (clazz != null && clazz.isAnnotationPresent(DocumentedFeature.class)) { - return clazz.getAnnotation(DocumentedFeature.class); - } - else { - return null; - } - } - - /** - * Return the Java class described by the ClassDoc doc - * - * @param doc - * @return - */ - private Class getClassForClassDoc(final ClassDoc doc) { - try { - return DocletUtils.getClassForDoc(doc); - } catch (ClassNotFoundException e) { - // we got a classdoc for a class we can't find. Maybe in a library or something - return null; - } catch (NoClassDefFoundError e) { - return null; - } catch (UnsatisfiedLinkError e) { - return null; // naughty BWA bindings - } + classElement, + clazz, + documentedFeature + ); } /** @@ -562,16 +523,6 @@ public final DocWorkUnit findWorkUnitForClass(final Class c) { return null; } - /** - * Return the ClassDoc associated with clazz - * - * @param clazz - * @return - */ - public ClassDoc getClassDocForClass(final Class clazz) { - return rootDoc.classNamed(clazz.getName()); - } - /** * High-level function that processes a single DocWorkUnit unit using its handler * diff --git a/src/main/java/org/broadinstitute/barclay/help/WDLDoclet.java b/src/main/java/org/broadinstitute/barclay/help/WDLDoclet.java index 906e9a64..51c5fa45 100644 --- a/src/main/java/org/broadinstitute/barclay/help/WDLDoclet.java +++ b/src/main/java/org/broadinstitute/barclay/help/WDLDoclet.java @@ -1,12 +1,12 @@ package org.broadinstitute.barclay.help; -import com.sun.javadoc.ClassDoc; import freemarker.template.Configuration; import freemarker.template.Template; import freemarker.template.TemplateException; import org.broadinstitute.barclay.argparser.CommandLineProgramProperties; import org.broadinstitute.barclay.argparser.WorkflowProperties; +import javax.lang.model.element.Element; import java.io.*; import java.util.List; import java.util.Map; @@ -16,18 +16,9 @@ */ public class WDLDoclet extends HelpDoclet { - /** - * Create a WDL doclet and generate the FreeMarker templates properties. - * @param rootDoc - * @throws IOException - */ - public static boolean start(final com.sun.javadoc.RootDoc rootDoc) throws IOException { - return new WDLDoclet().startProcessDocs(rootDoc); - } - @Override - public boolean includeInDocs(final DocumentedFeature documentedFeature, final ClassDoc classDoc, final Class clazz) { - if (super.includeInDocs(documentedFeature, classDoc, clazz)) { + public boolean includeInDocs(final DocumentedFeature documentedFeature, final Class clazz) { + if (super.includeInDocs(documentedFeature, clazz)) { boolean hasWorkflowProperties = clazz.getAnnotation(WorkflowProperties.class) != null; boolean isCommandLineProgram = clazz.getAnnotation(CommandLineProgramProperties.class) != null; if (hasWorkflowProperties) { @@ -46,26 +37,26 @@ public boolean includeInDocs(final DocumentedFeature documentedFeature, final Cl * @return Create and return a DocWorkUnit-derived object to handle WDLGen * for the target feature(s) represented by clazz. * - * @param documentedFeature DocumentedFeature annotation for the target feature - * @param classDoc javadoc classDoc for the target feature + * @param classElement Element for the target feature * @param clazz class of the target feature + * @param documentedFeature DocumentedFeature annotation for the target feature * @return DocWorkUnit to be used for this feature */ @Override - protected DocWorkUnit createWorkUnit( - final DocumentedFeature documentedFeature, - final com.sun.javadoc.ClassDoc classDoc, - final Class clazz) + public DocWorkUnit createWorkUnit( + final Element classElement, + final Class clazz, + final DocumentedFeature documentedFeature) { - return includeInDocs(documentedFeature, classDoc, clazz) ? + return includeInDocs(documentedFeature, clazz) ? // for WDL we don't need a custom DocWorkUnit, only a custom handler, so just use the // Barclay default DocWorkUnit class new DocWorkUnit( new WDLWorkUnitHandler(this), - documentedFeature, - classDoc, - clazz) : - null; + classElement, + clazz, + documentedFeature) + : null; } @Override diff --git a/src/main/java/org/broadinstitute/barclay/help/scanners/CommentScanner.java b/src/main/java/org/broadinstitute/barclay/help/scanners/CommentScanner.java new file mode 100644 index 00000000..32584657 --- /dev/null +++ b/src/main/java/org/broadinstitute/barclay/help/scanners/CommentScanner.java @@ -0,0 +1,51 @@ +package org.broadinstitute.barclay.help.scanners; + +import com.sun.source.doctree.DocTree; +import com.sun.source.util.DocTreeScanner; +import jdk.javadoc.doclet.DocletEnvironment; +import org.broadinstitute.barclay.utils.Utils; + +import javax.lang.model.element.Element; + +/** + * A {@link DocTreeScanner} to retrieve a javadoc comment, if any, for a given {@link Element}. + */ +class CommentScanner extends DocTreeScanner { + final DocletEnvironment docEnv; + final Element targetElement; + String targetComment; + + /** + * For internal use only. External callers should use + * {@link JavaLanguageModelScanners#getDocComment(DocletEnvironment, Element)} getDocComment} + * + * @param docEnv the {@link DocletEnvironment} + * @param targetElement the {@link Element} for which the documentation comment should be retrieved + */ + CommentScanner(final DocletEnvironment docEnv, final Element targetElement) { + Utils.nonNull(docEnv, "doclet env"); + Utils.nonNull(targetElement, "target element"); + + this.docEnv = docEnv; + this.targetElement = targetElement; + } + + @Override + public Void scan(final DocTree docTree, final Void unused) { + Utils.nonNull(docTree, "DocTree"); + if (docTree.getKind().equals(DocTree.Kind.DOC_COMMENT)) { + targetComment = docTree.toString(); + return null; + } + return super.scan(docTree, null); + } + + /** + * @return the comment for the {@link Element}. May be null + */ + String getComment() { + return targetComment; + } + +} + diff --git a/src/main/java/org/broadinstitute/barclay/help/scanners/CommentScannerWithTagFilter.java b/src/main/java/org/broadinstitute/barclay/help/scanners/CommentScannerWithTagFilter.java new file mode 100644 index 00000000..16835c5f --- /dev/null +++ b/src/main/java/org/broadinstitute/barclay/help/scanners/CommentScannerWithTagFilter.java @@ -0,0 +1,57 @@ +package org.broadinstitute.barclay.help.scanners; + +import com.sun.source.doctree.DocTree; +import com.sun.source.util.DocTreeScanner; +import jdk.javadoc.doclet.DocletEnvironment; +import org.broadinstitute.barclay.utils.Utils; + +import javax.lang.model.element.Element; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +/* + * A {@link DocTreeScanner} scanner to retrieve the javadoc comment for a given {@link Element}, + * with any embedded tags removed, given an existing DocTree. + */ +class CommentScannerWithTagFilter extends DocTreeScanner { + final DocTree docTree; + final DocletEnvironment docEnv; + final private List targetDocCommentParts = new ArrayList<>(); + + /** + * For internal use only. External callers should use + * {@link JavaLanguageModelScanners#getDocCommentWithoutTags(DocletEnvironment, Element)}} + * + * @param docEnv the {@link DocletEnvironment} + * @param docTree the {@link DocTree} for which the javadoc comment should be retrieved + */ + CommentScannerWithTagFilter(final DocletEnvironment docEnv, final DocTree docTree) { + Utils.nonNull(docEnv, "doclet environment"); + Utils.nonNull(docTree, "docTree"); + + this.docEnv = docEnv; + this.docTree = docTree; + } + + @Override + public Void scan(final DocTree t, final Void unused) { + Utils.nonNull(docTree, "DocTree"); + + if (t.getKind().equals(DocTree.Kind.TEXT)) { + // skip embedded tags and only retain text + targetDocCommentParts.add(t.toString()); + return null; + } + return super.scan(t, null); + } + + /** + * @return the javadoc comment for the {@link Element}, with any embedded tags removed. If no javadoc + * comment is present, an empty string will be returned. + */ + String getCommentWithoutTags() { + return targetDocCommentParts.stream().collect(Collectors.joining(" ")); + } + +} diff --git a/src/main/java/org/broadinstitute/barclay/help/scanners/DocumentedFeatureScanner.java b/src/main/java/org/broadinstitute/barclay/help/scanners/DocumentedFeatureScanner.java new file mode 100644 index 00000000..bddd88bc --- /dev/null +++ b/src/main/java/org/broadinstitute/barclay/help/scanners/DocumentedFeatureScanner.java @@ -0,0 +1,73 @@ +package org.broadinstitute.barclay.help.scanners; + +import jdk.javadoc.doclet.DocletEnvironment; +import jdk.javadoc.doclet.Reporter; +import org.broadinstitute.barclay.help.DocWorkUnit; +import org.broadinstitute.barclay.help.DocletUtils; +import org.broadinstitute.barclay.help.DocumentedFeature; +import org.broadinstitute.barclay.help.HelpDoclet; +import org.broadinstitute.barclay.utils.Utils; + +import javax.lang.model.element.Element; +import javax.lang.model.type.TypeKind; +import javax.lang.model.util.ElementScanner14; +import javax.tools.Diagnostic; +import java.util.Set; +import java.util.TreeSet; + +/** + * An {@link ElementScanner14} for finding {@link DocumentedFeature}s to be included in a Barclay doc + * task. Returns a set of {@link DocWorkUnit} objects. + */ +public class DocumentedFeatureScanner extends ElementScanner14 { + private final HelpDoclet helpDoclet; + private final DocletEnvironment docEnv; + private final Reporter reporter; + private Set workUnits = new TreeSet<>(); // Set of all things we are going to document + + /** + * For internal use only. External callers should use + * {@link JavaLanguageModelScanners#getWorkUnits(HelpDoclet, DocletEnvironment, Reporter, Set)}} + * + * @param helpDoclet the {@link HelpDoclet} + * @param docEnv the {@link DocletEnvironment} + * @param reporter reporter to be used to issue messages + */ + DocumentedFeatureScanner( + final HelpDoclet helpDoclet, + final DocletEnvironment docEnv, + final Reporter reporter) { + Utils.nonNull(helpDoclet, "helpDoclet"); + Utils.nonNull(docEnv, "doclet environment"); + Utils.nonNull(reporter, "logger"); + + this.helpDoclet = helpDoclet; + this.docEnv = docEnv; + this.reporter = reporter; + } + + @Override + public Void scan(final Element e, final Void unused) { + if (e.asType().getKind().equals(TypeKind.DECLARED)) { + final Class clazz = DocletUtils.getClassForDeclaredElement(e, docEnv, reporter); + final DocumentedFeature documentedFeature = DocletUtils.getDocumentedFeatureForClass(clazz); + if (documentedFeature != null) { + if (documentedFeature.enable() && helpDoclet.includeInDocs(documentedFeature, clazz)) { + final DocWorkUnit workUnit = helpDoclet.createWorkUnit(e, clazz, documentedFeature); + if (workUnit != null) { + workUnits.add(workUnit); + } + } else { + reporter.print(Diagnostic.Kind.NOTE, "Skipping disabled documentation for feature: " + e); + } + } + } + return super.scan(e, unused); + } + + /** + * Return the {@link DocWorkUnit}s for the included elements. + */ + Set getWorkUnits() { return workUnits; } + +} diff --git a/src/main/java/org/broadinstitute/barclay/help/scanners/FieldScanner.java b/src/main/java/org/broadinstitute/barclay/help/scanners/FieldScanner.java new file mode 100644 index 00000000..7161f872 --- /dev/null +++ b/src/main/java/org/broadinstitute/barclay/help/scanners/FieldScanner.java @@ -0,0 +1,60 @@ +package org.broadinstitute.barclay.help.scanners; + +import jdk.javadoc.doclet.DocletEnvironment; +import org.broadinstitute.barclay.utils.Utils; + +import javax.lang.model.element.Element; +import javax.lang.model.element.ElementKind; +import javax.lang.model.util.ElementScanner14; +import java.lang.reflect.Field; + +/** + * An {@link ElementScanner14} for finding the {@link Element} that corresponds to a given {@link Field}, given + * an Element that represents the class in which the field is declared. + * + * It's possible in some cases for a field to not have a corresponding element within a given enclosing + * element, even if the field is declared within the class represented by the (enclosing) element, i.e., + * this can happen if the field is initialized by instantiating an anonymous class. + */ +public class FieldScanner extends ElementScanner14 { + final DocletEnvironment docEnv; + final String queryFieldName; + final ElementKind elementKind; + Element resultElement; + + /* + * For internal use only. External callers should use + * {@link #findElementForField(DocletEnvironment, Field, Element)} + * + * @param docEnv the {@link DocletEnvironment} + * @param queryFieldName name of the {@link Field} to interrogate + */ + FieldScanner(final DocletEnvironment docEnv, final String queryFieldName, final ElementKind elementKind ) { + Utils.nonNull(docEnv, "doclet environment"); + Utils.nonNull(queryFieldName, "queryFieldName"); + + this.docEnv = docEnv; + this.queryFieldName = queryFieldName; + this.elementKind = elementKind; + } + + @Override + public Void scan(final Element e, final Void unused) { + if (e.getSimpleName().toString().equals(queryFieldName)) { + final ElementKind k = e.getKind(); + if (k == elementKind) { + // we need to make sure we only select FIELD elements since the same + // queryname can show up as paramaters, etc. + resultElement = e; + return null; + } + } + return super.scan(e, unused); + } + + /** + * @return the resulting {@link Element}, if any for the {@link Field} provided + */ + final Element getFieldElement() { return resultElement; } + +} diff --git a/src/main/java/org/broadinstitute/barclay/help/scanners/JavaLanguageModelScanners.java b/src/main/java/org/broadinstitute/barclay/help/scanners/JavaLanguageModelScanners.java new file mode 100644 index 00000000..95c9484b --- /dev/null +++ b/src/main/java/org/broadinstitute/barclay/help/scanners/JavaLanguageModelScanners.java @@ -0,0 +1,145 @@ +package org.broadinstitute.barclay.help.scanners; + +import com.sun.source.doctree.DocCommentTree; +import jdk.javadoc.doclet.DocletEnvironment; +import jdk.javadoc.doclet.Reporter; +import org.broadinstitute.barclay.help.DocWorkUnit; +import org.broadinstitute.barclay.help.HelpDoclet; +import org.broadinstitute.barclay.utils.Utils; + +import javax.lang.model.element.Element; +import javax.lang.model.element.ElementKind; +import javax.lang.model.util.ElementFilter; +import java.lang.reflect.Field; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** + * Interface to javax.lang.model methods to find and retrieve various java language elements needed by + * the Barclay doc and help tasks. + */ +public class JavaLanguageModelScanners { + private final static String EMPTY_COMMENT = ""; + + /** + * @param helpDoclet the {@link HelpDoclet} used for the Barlcay doc task being executed, may not be null + * @param docEnv the {@link DocletEnvironment} for the Barclay doc task being executed, may not be null + * @param reporter Reporter to use to display messages, may not be null + * @param includedElements the set of {@link Element}s included in the Barclay doc run, may not be null + * @return the set of {@DocWorkUnit}s for the {@code includedElements} + */ + public static Set getWorkUnits( + final HelpDoclet helpDoclet, + final DocletEnvironment docEnv, + final Reporter reporter, + final Set includedElements) { + Utils.nonNull(helpDoclet, "helps doclet"); + Utils.nonNull(docEnv, "doclet environment"); + Utils.nonNull(reporter, "reporter"); + Utils.nonNull(includedElements, "includedElements"); + + final DocumentedFeatureScanner documentedFeatureScanner = new DocumentedFeatureScanner(helpDoclet, docEnv, reporter); + documentedFeatureScanner.scan(ElementFilter.typesIn(includedElements), null); + return documentedFeatureScanner.getWorkUnits(); + } + + /** + * @param docEnv the {@link DocletEnvironment} for the Barlcay doc task being executed, may not be null + * @param targetElement the {@link Element} for which the javadoc comment should be retrieved, may not be null + * @return the javadoc comment for the target {@link Element}, or an empty string if no comment is present + */ + public static String getDocComment(final DocletEnvironment docEnv, final Element targetElement) { + Utils.nonNull(docEnv, "doclet env"); + Utils.nonNull(targetElement, "target element"); + + final CommentScanner docScanner = new CommentScanner(docEnv, targetElement); + final DocCommentTree docTree = docEnv.getDocTrees().getDocCommentTree(targetElement); + if (docTree == null) { + return EMPTY_COMMENT; + } + docScanner.scan(docTree, null); + return docScanner.getComment(); + } + + /** + * @param docEnv the {@link DocletEnvironment} for the Barclay doc task being executed, may not be null + * @param targetElement the {@link Element} for which the javadoc comment should be retrieved, may not be null + * @return the javadoc comment, if any, with all embedded tags removed, otherwise an empty String + */ + public static String getDocCommentWithoutTags(final DocletEnvironment docEnv, final Element targetElement) { + Utils.nonNull(docEnv, "doclet env"); + Utils.nonNull(targetElement, "targetElement"); + + final DocCommentTree docTree = docEnv.getDocTrees().getDocCommentTree(targetElement); + if (docTree == null) { + return ""; + } + final CommentScannerWithTagFilter docScanner = new CommentScannerWithTagFilter(docEnv, docTree); + docScanner.scan(docTree, null); + return docScanner.getCommentWithoutTags(); + } + + /** + * @param docEnv the {@link DocletEnvironment} for the Barclay doc task being executed, may not be null + * @param targetElement the {@link Element} for which the javadoc comment first sentence should be retrieved, + * may not be null + * @return the first sentence of the javadoc comment for the target {@link Element}, or an empty string if + * no comment is present + */ + public static String getDocCommentFirstSentence(final DocletEnvironment docEnv, final Element targetElement) { + final DocCommentTree docTree = docEnv.getDocTrees().getDocCommentTree(targetElement); + final StringBuilder sb = new StringBuilder(); + if (docTree != null) { + docTree.getFirstSentence().forEach(t -> sb.append(t.toString())); + } + return sb.toString(); + } + + /** + * It's possible in some cases for a field to not have a corresponding element within a given enclosing + * element, even if the field is declared within the class represented by the (enclosing) element, i.e., + * this can happen if the field is initialized by instantiating an anonymous class. + * + * @param docEnv the {@link DocletEnvironment} for the Barclay doc run, may not be null + * @param enclosingClassElement the element corresponding to the enclosing class in which the target + * {@link Field} is declared, may not be null + * @param targetField the target {@link Field} for which an element should be found + * @param targetElementKind the target {@link ElementKind} to look for, may not be null + * @return the Element for the Field {@code targetField}, or null if no element can be located + */ + public static Element getElementForField( + final DocletEnvironment docEnv, + final Element enclosingClassElement, + final Field targetField, + final ElementKind targetElementKind) { + Utils.nonNull(docEnv, "doclet environment"); + Utils.nonNull(enclosingClassElement, "enclosing element"); + Utils.nonNull(targetField, "target field"); + Utils.nonNull(targetElementKind, "target element kind"); + + final FieldScanner fieldScanner = new FieldScanner(docEnv, targetField.getName(), targetElementKind); + fieldScanner.scan(enclosingClassElement); + return fieldScanner.getFieldElement(); + } + + /** + * @param docEnv the {@link DocletEnvironment}, may not be null + * @param targetElement the target {@link Element} to use to find inline tags, may not be null + * @return map of tag name to tag parts list, or an empty map if no tags present, for all unknown inline tags; + * it is the caller's responsibility to extract and recognize doclet-specific tags from the list returned + */ + public static Map> getUnknownInlineTags(final DocletEnvironment docEnv, final Element targetElement) { + Utils.nonNull(docEnv, "doclet env"); + Utils.nonNull(targetElement, "targetElement"); + + final DocCommentTree docTree = docEnv.getDocTrees().getDocCommentTree(targetElement); + if (docTree != null) { + final UnknownInlineTagScanner unknownInlineTagScanner = new UnknownInlineTagScanner(docEnv, docTree); + unknownInlineTagScanner.scan(docTree, null); + return unknownInlineTagScanner.getInlineTags(); + } + return new LinkedHashMap<>(); + } +} diff --git a/src/main/java/org/broadinstitute/barclay/help/scanners/UnknownInlineTagScanner.java b/src/main/java/org/broadinstitute/barclay/help/scanners/UnknownInlineTagScanner.java new file mode 100644 index 00000000..a2a70c9b --- /dev/null +++ b/src/main/java/org/broadinstitute/barclay/help/scanners/UnknownInlineTagScanner.java @@ -0,0 +1,61 @@ +package org.broadinstitute.barclay.help.scanners; + +import com.sun.source.doctree.DocTree; +import com.sun.source.doctree.UnknownInlineTagTree; +import com.sun.source.util.DocTreeScanner; +import jdk.javadoc.doclet.DocletEnvironment; +import org.broadinstitute.barclay.utils.Utils; + +import javax.lang.model.element.Element; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/* + * A DocTree scanner to retrieve unknown inline tags (not block tags) that are embedded in a javadoc comment + * for a given Element. + */ +public class UnknownInlineTagScanner extends DocTreeScanner { + final DocTree docTree; + final DocletEnvironment docEnv; + final private Map> inlineTags = new HashMap<>(); + + /** + * For internal use only. External callers should use + * {@link JavaLanguageModelScanners#getUnknownInlineTags(DocletEnvironment, Element)}} + * + * @param docEnv the {@link DocletEnvironment} + * @param docTree the {@link DocTree} for which the javadoc comment should be retrieved + */ + UnknownInlineTagScanner(final DocletEnvironment docEnv, final DocTree docTree) { + Utils.nonNull(docEnv, "doclet environment"); + Utils.nonNull(docTree, "docTree"); + + this.docEnv = docEnv; + this.docTree = docTree; + } + + @Override + public Void scan(final DocTree t, final Void unused) { + Utils.nonNull(docTree, "DocTree"); + + // unknown inline tags might be custom tags, so break them down and return the parts + // for the caller to parse + if (t.getKind().equals(DocTree.Kind.UNKNOWN_INLINE_TAG)) { + final UnknownInlineTagTree tagTree = (UnknownInlineTagTree) t; + final List tagParts = tagTree.getContent().stream().map(Object::toString).toList(); + inlineTags.put(tagTree.getTagName(), tagParts); + return null; + } + return super.scan(t, null); + } + + /** + * @return a map of inline tags embedded in the doc comment for the {@link Element}. If no tags + * are present, an empty map will be returned. + */ + Map> getInlineTags() { + return inlineTags; + } + +} diff --git a/src/main/java/org/broadinstitute/barclay/utils/JVMUtils.java b/src/main/java/org/broadinstitute/barclay/utils/JVMUtils.java index e2ce240a..804c2aaa 100644 --- a/src/main/java/org/broadinstitute/barclay/utils/JVMUtils.java +++ b/src/main/java/org/broadinstitute/barclay/utils/JVMUtils.java @@ -1,10 +1,6 @@ package org.broadinstitute.barclay.utils; -import java.lang.reflect.Field; import java.lang.reflect.Modifier; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; public class JVMUtils { /** @@ -17,23 +13,4 @@ public static boolean isConcrete( Class clazz ) { !Modifier.isInterface(clazz.getModifiers()); } - /** - * Find the field with the given name in the class. Will inspect all fields, independent - * of access level. - * @param type Class in which to search for the given field. - * @param fieldName Name of the field for which to search. - * @return The field, or null if no such field exists. - */ - public static Field findField(Class type, String fieldName ) { - while( type != null ) { - Field[] fields = type.getDeclaredFields(); - for( Field field: fields ) { - if( field.getName().equals(fieldName) ) - return field; - } - type = type.getSuperclass(); - } - return null; - } - } diff --git a/src/test/java/org/broadinstitute/barclay/argparser/CollectionArgumentUnitTests.java b/src/test/java/org/broadinstitute/barclay/argparser/CollectionArgumentUnitTests.java index bf00f306..2fcfb97f 100644 --- a/src/test/java/org/broadinstitute/barclay/argparser/CollectionArgumentUnitTests.java +++ b/src/test/java/org/broadinstitute/barclay/argparser/CollectionArgumentUnitTests.java @@ -16,13 +16,13 @@ public class CollectionArgumentUnitTests { private class UninitializedCollections { @Argument - public List LIST; + private List LIST; @Argument - public ArrayList ARRAY_LIST; + private ArrayList ARRAY_LIST; @Argument - public HashSet HASH_SET; + private HashSet HASH_SET; @PositionalArguments - public Collection COLLECTION; + private Collection COLLECTION; } @DataProvider(name="uninitializedCollections") @@ -75,7 +75,7 @@ public void testUninitializedCollections( private class InitializedCollections { @Argument - public List LIST = makeList("foo", "bar"); + private List LIST = makeList("foo", "bar"); } @DataProvider(name="initializedCollections") @@ -154,10 +154,10 @@ private abstract class CollectionForListFileArguments { private class EnabledListFileArguments extends CollectionForListFileArguments { @Argument - public List LIST = makeList("foo", "bar"); + private List LIST = makeList("foo", "bar"); @Argument - public List LIST2 = makeList("baz"); + private List LIST2 = makeList("baz"); public List getList1() { return LIST; }; @@ -167,10 +167,10 @@ private class EnabledListFileArguments extends CollectionForListFileArguments { private class SuppressedListFileArguments extends CollectionForListFileArguments { @Argument(suppressFileExpansion = true) - public List LIST = makeList("foo", "bar"); + private List LIST = makeList("foo", "bar"); @Argument(suppressFileExpansion = true) - public List LIST2 = makeList("baz"); + private List LIST2 = makeList("baz"); public List getList1() { return LIST; }; public List getList2() { return LIST2; }; @@ -305,7 +305,7 @@ public void testCollectionFromExpansionFile( private class PositionalCollection { @PositionalArguments - public List positionalCollection = new ArrayList<>(); + private List positionalCollection = new ArrayList<>(); } @Test @@ -418,7 +418,7 @@ public void testGetCommandLineWithExpansionFile() throws IOException{ private class NonCollectionFileExpansionSuppression { @Argument(suppressFileExpansion = true) - public int bogusFileExpansionArg; + private int bogusFileExpansionArg; } @Test(expectedExceptions = CommandLineException.CommandLineParserInternalException.class) @@ -429,7 +429,7 @@ public void testRejectNonCollectionFileExpansionSuppression() { private class UninitializedCollectionThatCannotBeAutoInitializedArguments { @Argument - public Set SET; + private Set SET; } @Test(expectedExceptions = CommandLineException.CommandLineParserInternalException.class) diff --git a/src/test/java/org/broadinstitute/barclay/argparser/CommandLinePluginUnitTest.java b/src/test/java/org/broadinstitute/barclay/argparser/CommandLinePluginUnitTest.java index 48b5367e..0a0344c3 100644 --- a/src/test/java/org/broadinstitute/barclay/argparser/CommandLinePluginUnitTest.java +++ b/src/test/java/org/broadinstitute/barclay/argparser/CommandLinePluginUnitTest.java @@ -6,6 +6,7 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; +import java.lang.reflect.InvocationTargetException; import java.util.*; /** @@ -116,7 +117,11 @@ public TestPluginBase createInstanceForPlugin(final Class pluggableClass) thr testPlugins.get(simpleName).getClass().getName()) ); } else { - testPluginBase = (TestPluginBase) pluggableClass.newInstance(); + try { + testPluginBase = (TestPluginBase) pluggableClass.getDeclaredConstructor(new Class[0]).newInstance(); + } catch (InvocationTargetException | NoSuchMethodException e) { + throw new IllegalArgumentException("plugin", e); + } testPlugins.put(simpleName, testPluginBase); } return testPluginBase; @@ -392,9 +397,14 @@ public boolean includePluginClass(final Class clazz) { @Override public TestPluginArgCollisionBase createInstanceForPlugin(Class pluggableClass) throws IllegalAccessException, InstantiationException { - final TestPluginArgCollisionBase plugin = (TestPluginArgCollisionBase) pluggableClass.newInstance(); - pluginInstances.put(pluggableClass.getSimpleName(), plugin); - return plugin; + final TestPluginArgCollisionBase plugin; + try { + plugin = (TestPluginArgCollisionBase) pluggableClass.getDeclaredConstructor(new Class[0]).newInstance(); + pluginInstances.put(pluggableClass.getSimpleName(), plugin); + return plugin; + } catch (InvocationTargetException | NoSuchMethodException e) { + throw new IllegalArgumentException("plugin", e); + } } @Override diff --git a/src/test/java/org/broadinstitute/barclay/argparser/NamedArgumentDefinitionUnitTest.java b/src/test/java/org/broadinstitute/barclay/argparser/NamedArgumentDefinitionUnitTest.java index 4b6c09f6..8172dc00 100644 --- a/src/test/java/org/broadinstitute/barclay/argparser/NamedArgumentDefinitionUnitTest.java +++ b/src/test/java/org/broadinstitute/barclay/argparser/NamedArgumentDefinitionUnitTest.java @@ -31,11 +31,11 @@ public Object[][] getOptionalOrRequiredTests() { { new Object() { @Argument(optional=false) Integer arg; }, "arg", false, NamedArgumentDefinition.NULL_ARGUMENT_STRING}, // reference, initialized, optional - { new Object() { @Argument(optional=true) Integer arg = new Integer(27); }, "arg", true, "27" }, + { new Object() { @Argument(optional=true) Integer arg = Integer.valueOf(27); }, "arg", true, "27" }, // reference, initialized, required // NOTE: non-intuitive case: it looks like its required but isn't since it has a value - { new Object() { @Argument(optional=false) Integer arg = new Integer(27); }, "arg", true, "27" }, + { new Object() { @Argument(optional=false) Integer arg = Integer.valueOf(27); }, "arg", true, "27" }, // collection, null, optional { new Object() { @Argument(optional=true) List arg; }, "arg", true, NamedArgumentDefinition.NULL_ARGUMENT_STRING}, diff --git a/src/test/java/org/broadinstitute/barclay/help/DefaultDocWorkUnitHandlerUnitTest.java b/src/test/java/org/broadinstitute/barclay/help/DefaultDocWorkUnitHandlerUnitTest.java deleted file mode 100644 index e981abe0..00000000 --- a/src/test/java/org/broadinstitute/barclay/help/DefaultDocWorkUnitHandlerUnitTest.java +++ /dev/null @@ -1,113 +0,0 @@ -package org.broadinstitute.barclay.help; - -import com.sun.javadoc.ClassDoc; -import com.sun.javadoc.FieldDoc; -import org.broadinstitute.barclay.argparser.CommandLineProgramProperties; -import org.broadinstitute.barclay.argparser.TestProgramGroup; -import org.broadinstitute.barclay.help.testinputs.TestArgumentContainer; -import org.broadinstitute.barclay.help.testinputs.TestExtraDocs; -import org.mockito.Mockito; -import org.testng.Assert; -import org.testng.annotations.DataProvider; -import org.testng.annotations.Test; - -import java.util.Collections; -import java.util.Map; - -/** - * @author Daniel Gomez-Sanchez (magicDGS) - */ -public class DefaultDocWorkUnitHandlerUnitTest { - - @DataProvider - public static Object[][] workUnitDescriptions() { - return new Object[][] { - {TestArgumentContainer.class, "", Collections.EMPTY_MAP, ""}, - {TestExtraDocs.class, "Javadoc description", Collections.EMPTY_MAP, ""}, - {TestExtraDocs.class, "Javadoc description \nin two lines", Collections.singletonMap("", "Inline tag"), "Inline tag"} - }; - } - - @DataProvider - public static Object[][] workUnitSummary() { - return new Object[][] { - {TestArgumentContainer.class, "", Collections.EMPTY_MAP, TestArgumentContainer.ONE_LINE_SUMMARY}, - {TestExtraDocs.class, "Javadoc description", Collections.EMPTY_MAP, "Javadoc description"}, - {TestExtraDocs.class, "Javadoc description \nin two lines", Collections.singletonMap("", "Inline tag"), "Javadoc description in two lines"} - }; - } - - @DataProvider - public static Object[][] workUnitGroupName() { - return new Object[][] { - {TestArgumentContainer.class, TestArgumentContainer.GROUP_NAME}, - {TestExtraDocs.class, TestExtraDocs.GROUP_NAME} - }; - } - - @DataProvider - public static Object[][] workUnitGroupSummary() { - return new Object[][] { - {TestArgumentContainer.class, TestProgramGroup.DESCRIPTION}, - {TestExtraDocs.class, ""}, - }; - } - - @Test(dataProvider = "workUnitDescriptions") - public void testGetDescription(final Class docWorkUnitClazz, final String javadocText, final Map inlineTags, - final String expectedDescription) { - final DefaultDocWorkUnitHandler handler = getDefaultWorkUnitHandlerInstance(); - final DocWorkUnit mockWorkUnit = createMockWorkUnit(handler, docWorkUnitClazz, javadocText, inlineTags); - Assert.assertEquals(handler.getDescription(mockWorkUnit), expectedDescription); - } - - @Test(dataProvider = "workUnitSummary") - public void testGetSummaryForWorkUnit(final Class docWorkUnitClazz, final String javadocText, final Map inlineTags, - final String expectedSummary) { - final DefaultDocWorkUnitHandler handler = getDefaultWorkUnitHandlerInstance(); - final DocWorkUnit mockWorkUnit = createMockWorkUnit(handler, docWorkUnitClazz, javadocText, inlineTags); - Assert.assertEquals(handler.getSummaryForWorkUnit(mockWorkUnit), expectedSummary); - } - - @Test(dataProvider = "workUnitGroupName") - public void testGetGroupNameForWorkUnit(final Class docWorkUnitClazz, final String expectedGroupName) { - final DefaultDocWorkUnitHandler handler = getDefaultWorkUnitHandlerInstance(); - final DocWorkUnit mockWorkUnit = createMockWorkUnit(handler, docWorkUnitClazz, "", Collections.emptyMap()); - Assert.assertEquals(handler.getGroupNameForWorkUnit(mockWorkUnit), expectedGroupName); - } - - @Test(dataProvider = "workUnitGroupSummary") - public void testGetGroupSummaryForWorkUnit(final Class docWorkUnitClazz, final String expectedGroupSummary) { - final DefaultDocWorkUnitHandler handler = getDefaultWorkUnitHandlerInstance(); - final DocWorkUnit mockWorkUnit = createMockWorkUnit(handler, docWorkUnitClazz, "", Collections.emptyMap()); - Assert.assertEquals(handler.getGroupSummaryForWorkUnit(mockWorkUnit), expectedGroupSummary); - } - - @DocumentedFeature - @CommandLineProgramProperties(summary = "CLP without no-args constructor", oneLineSummary = "CLP without no-args constructor", programGroup = TestProgramGroup.class) - private final class ClpWithoutNoArgsConstructor { - public ClpWithoutNoArgsConstructor(final int arg) { } - } - - @Test(expectedExceptions = RuntimeException.class) - public void testProcessWorkUnitWithoutNoArgsConstructorClpThrows() { - final DefaultDocWorkUnitHandler handler = getDefaultWorkUnitHandlerInstance(); - final DocWorkUnit workUnit = createMockWorkUnit(handler, ClpWithoutNoArgsConstructor.class, "", Collections.emptyMap()); - handler.processWorkUnit(workUnit, Collections.emptyList(), Collections.emptyList()); - } - - private static DocWorkUnit createMockWorkUnit(final DefaultDocWorkUnitHandler handler, final Class docWorkUnitClazz, final String javadocText, final Map inlineTags) { - final ClassDoc mockClassDoc = DocGenMocks.mockClassDoc(javadocText, inlineTags); - return new DocWorkUnit( - handler, - docWorkUnitClazz.getAnnotation(DocumentedFeature.class), - mockClassDoc, - docWorkUnitClazz - ); - - } - - private static DefaultDocWorkUnitHandler getDefaultWorkUnitHandlerInstance() { - return new DefaultDocWorkUnitHandler(new HelpDoclet()); - } -} \ No newline at end of file diff --git a/src/test/java/org/broadinstitute/barclay/help/DocGenMocks.java b/src/test/java/org/broadinstitute/barclay/help/DocGenMocks.java deleted file mode 100644 index bc9040a4..00000000 --- a/src/test/java/org/broadinstitute/barclay/help/DocGenMocks.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.broadinstitute.barclay.help; - -import com.sun.javadoc.ClassDoc; -import com.sun.javadoc.Tag; -import org.mockito.Mockito; - -import java.util.Arrays; -import java.util.Collections; -import java.util.Map; - -/** - * @author Daniel Gomez-Sanchez (magicDGS) - */ -public class DocGenMocks { - - /** - * @param inlineTags map of (custom) tag names in javadoc to its text. - * - * @return mocked class doc. - */ - public static ClassDoc mockClassDoc(final String javadocText, - final Map inlineTags) { - // mock class - final ClassDoc mockedClassDoc = Mockito.mock(ClassDoc.class); - // mock the javadoc text - final Tag[] javadoc = Arrays.stream(javadocText.split("\n")) - .map(line -> mockTag(null, line)) - .toArray(Tag[]::new); - Mockito.when(mockedClassDoc.firstSentenceTags()).thenReturn(javadoc); - final Tag[] inline = inlineTags.entrySet().stream() - .map(entry -> mockTag(entry.getKey(), entry.getValue())) - .toArray(Tag[]::new); - Mockito.when(mockedClassDoc.inlineTags()).thenReturn(inline); - return mockedClassDoc; - } - - private static Tag mockTag(final String name, final String text) { - final Tag tag = Mockito.mock(Tag.class); - Mockito.when(tag.name()).thenReturn(name); - Mockito.when(tag.text()).thenReturn(text); - return tag; - } -} diff --git a/src/test/java/org/broadinstitute/barclay/help/DocWorkUnitTest.java b/src/test/java/org/broadinstitute/barclay/help/DocWorkUnitTest.java deleted file mode 100644 index 1ced1180..00000000 --- a/src/test/java/org/broadinstitute/barclay/help/DocWorkUnitTest.java +++ /dev/null @@ -1,110 +0,0 @@ -package org.broadinstitute.barclay.help; - -import com.sun.javadoc.ClassDoc; -import org.broadinstitute.barclay.argparser.CommandLineProgramProperties; -import org.broadinstitute.barclay.argparser.DeprecatedFeature; -import org.broadinstitute.barclay.argparser.TestProgramGroup; -import org.broadinstitute.barclay.help.testinputs.TestArgumentContainer; -import org.broadinstitute.barclay.help.testinputs.TestExtraDocs; -import org.testng.Assert; -import org.testng.annotations.DataProvider; -import org.testng.annotations.Test; - -import java.util.Collections; - -/** - * @author Daniel Gomez-Sanchez (magicDGS) - */ -public class DocWorkUnitTest { - - @Test - public void testPropertyMap() { - final String property = "test_property"; - final String value = "test_value"; - final DocWorkUnit workUnit = createDocWorkUnitForDefaultHandler(TestExtraDocs.class, DocGenMocks.mockClassDoc("", Collections.emptyMap())); - Assert.assertTrue(workUnit.getRootMap().isEmpty()); - Assert.assertEquals(workUnit.getProperty(property), null); - workUnit.setProperty(property, value); - Assert.assertEquals(workUnit.getProperty(property), value); - Assert.assertEquals(workUnit.getRootMap().size(), 1); - } - - @Test - public void testGetName() { - Assert.assertEquals( - createDocWorkUnitForDefaultHandler(TestExtraDocs.class, DocGenMocks.mockClassDoc("", Collections.emptyMap())).getName(), "TestExtraDocs"); - } - - @Test - public void testGetCommandLineProperties() { - Assert.assertNull( - createDocWorkUnitForDefaultHandler(TestExtraDocs.class, DocGenMocks.mockClassDoc("", Collections.emptyMap())).getCommandLineProperties()); - Assert.assertNotNull( - createDocWorkUnitForDefaultHandler(TestArgumentContainer.class, DocGenMocks.mockClassDoc("", Collections.emptyMap())).getCommandLineProperties()); - } - - @DataProvider - public Object[][] betaFeatureData() { - return new Object[][] { - {TestExtraDocs.class, false}, - {TestArgumentContainer.class, true} - }; - } - - @Test(dataProvider = "betaFeatureData") - public void tesGetBetaFeature(final Class clazz, final boolean isBetaFeature) { - Assert.assertEquals(createDocWorkUnitForDefaultHandler(clazz, DocGenMocks.mockClassDoc("", Collections.emptyMap())).isBetaFeature(), - isBetaFeature); - } - - @DataProvider - public Object[][] experimentalFeatureData() { - return new Object[][] { - {TestExtraDocs.class, true}, - {TestArgumentContainer.class, false} - }; - } - - @Test(dataProvider = "experimentalFeatureData") - public void tesGetExperimentalFeature(final Class clazz, final boolean isExperimentalFeature) { - Assert.assertEquals(createDocWorkUnitForDefaultHandler(clazz, DocGenMocks.mockClassDoc("", Collections.emptyMap())).isExperimentalFeature(), - isExperimentalFeature); - } - - @CommandLineProgramProperties( - summary = "test CLP deprecation", - oneLineSummary = "", - programGroup = TestProgramGroup.class) - @DeprecatedFeature - @DocumentedFeature - public class DeprecatedCLPTest { - } - - @Test - public void testDeprecatedCommandLineProgram() { - final DocWorkUnit deprecatedCLPWorkUnit = createDocWorkUnitForDefaultHandler(DeprecatedCLPTest.class, - DocGenMocks.mockClassDoc("", Collections.emptyMap())); - Assert.assertTrue(deprecatedCLPWorkUnit.isDeprecatedFeature()); - Assert.assertEquals(deprecatedCLPWorkUnit.getDeprecationDetail(), "This feature is deprecated and will be removed in a future release."); - } - - @Test - public void testCompareTo() { - final DocWorkUnit first = createDocWorkUnitForDefaultHandler(TestArgumentContainer.class, DocGenMocks.mockClassDoc("", Collections.emptyMap())); - final DocWorkUnit second = createDocWorkUnitForDefaultHandler(TestExtraDocs.class, DocGenMocks.mockClassDoc("", Collections.emptyMap())); - Assert.assertEquals(first.compareTo(first), 0); - Assert.assertTrue(first.compareTo(second) < 0); - Assert.assertTrue(second.compareTo(first) > 0); - } - - private DocWorkUnit createDocWorkUnitForDefaultHandler( - final Class clazz, final ClassDoc classDoc) { - return new DocWorkUnit( - new DefaultDocWorkUnitHandler(new HelpDoclet()), - clazz.getAnnotation(DocumentedFeature.class), - classDoc, - clazz - ); - } - -} \ No newline at end of file diff --git a/src/test/java/org/broadinstitute/barclay/help/DocumentationGenerationIntegrationTest.java b/src/test/java/org/broadinstitute/barclay/help/DocumentationGenerationIntegrationTest.java index ccc3e662..54b4ed9b 100644 --- a/src/test/java/org/broadinstitute/barclay/help/DocumentationGenerationIntegrationTest.java +++ b/src/test/java/org/broadinstitute/barclay/help/DocumentationGenerationIntegrationTest.java @@ -1,5 +1,6 @@ package org.broadinstitute.barclay.help; +import org.apache.commons.io.FileUtils; import org.broadinstitute.barclay.help.testdoclets.TestDoclet; import org.testng.Assert; import org.testng.annotations.DataProvider; @@ -12,12 +13,13 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; +import java.util.ServiceLoader; +import java.util.spi.ToolProvider; /** * Integration test for documentation generation. */ public class DocumentationGenerationIntegrationTest { - private static String inputResourcesDir = "src/main/resources/org/broadinstitute/barclay/"; private static String testResourcesDir = "src/test/resources/org/broadinstitute/barclay/"; @@ -38,7 +40,11 @@ public class DocumentationGenerationIntegrationTest { private static final List COMMON_ARG_LIST = Arrays.asList( "-build-timestamp", "2016/01/01 01:01:01", // dummy, constant timestamp "-absolute-version", "11.1", // dummy version - "-docletpath", "build/libs", + "-windowtitle", "gradle includes a window title so test it", + "-doctitle", "gradle includes a doctitle so test it", + "-quiet", // gradle includes this so test it + "-docletpath", + "out/production/classes", "-verbose", "-cp", System.getProperty("java.class.path") ); @@ -49,6 +55,8 @@ public class DocumentationGenerationIntegrationTest { "org_broadinstitute_barclay_help_testinputs_TestDeprecatedCLP" ); + private final boolean UPDATE_TEST_OUTPUTS = false; + // Class wrapper to hold test args. This is required because to when running tests, NGTest/gradle spew // the entire serialized test params to the console for every test, which winds up exceeding the travis // test log size. @@ -287,6 +295,11 @@ public Object[][] getDocGenTestParams() { }; } + @Test + public void testAssertUpdateTestsIsFalse(){ + Assert.assertFalse(UPDATE_TEST_OUTPUTS); + } + @Test(dataProvider = "getDocGenTestParams") public void testDocGenRoundTrip( final Class docletClass, @@ -308,15 +321,32 @@ public void testDocGenRoundTrip( outputDir.deleteOnExit(); // pull all our arguments together: - List javadocArgs = docArgList(docletClass, docletArgs.getArgsList(), inputTemplatesFolder, outputDir, requestedIndexFileExtension, requestedOutputFileExtension); + List javadocArgs = new ArrayList<>(); + //javadocArgs.add("javadoc"); + javadocArgs.addAll(docArgList( + docletClass, + docletArgs.getArgsList(), + inputTemplatesFolder, + outputDir, + requestedIndexFileExtension, + requestedOutputFileExtension)); for (int i = 0 ; i < customDocletArgs.length; ++i) { javadocArgs.add(customDocletArgs[i]); } - // run javadoc with the custom doclet - com.sun.tools.javadoc.Main.execute( - javadocArgs.toArray(new String[] {}) - ); + ToolProvider jdProvider = null; + for (final ToolProvider tp : ServiceLoader.load(ToolProvider.class)) { + if (tp.name().equals("javadoc")) { + jdProvider = tp; + break; + } + } + if (jdProvider == null) { + throw new IllegalStateException("Can't find javadoc tool"); + } + + final int retCode = jdProvider.run(System.out, System.err, javadocArgs.toArray(new String[0])); + Assert.assertEquals(retCode, 0); // Compare index files assertFileContentsIdentical( @@ -342,6 +372,9 @@ public void testDocGenRoundTrip( private void assertFileContentsIdentical( final File actualFile, final File expectedFile) throws IOException { + if (UPDATE_TEST_OUTPUTS) { + FileUtils.copyFile(actualFile, expectedFile); + } byte[] actualBytes = Files.readAllBytes(actualFile.toPath()); byte[] expectedBytes = Files.readAllBytes(expectedFile.toPath()); Assert.assertEquals(actualBytes, expectedBytes); diff --git a/src/test/java/org/broadinstitute/barclay/help/testdoclets/TestDoclet.java b/src/test/java/org/broadinstitute/barclay/help/testdoclets/TestDoclet.java index e7396231..79307a98 100644 --- a/src/test/java/org/broadinstitute/barclay/help/testdoclets/TestDoclet.java +++ b/src/test/java/org/broadinstitute/barclay/help/testdoclets/TestDoclet.java @@ -1,12 +1,14 @@ package org.broadinstitute.barclay.help.testdoclets; -import com.sun.javadoc.ClassDoc; -import com.sun.javadoc.RootDoc; +import jdk.javadoc.doclet.DocletEnvironment; +import org.broadinstitute.barclay.help.DefaultDocWorkUnitHandler; import org.broadinstitute.barclay.help.DocException; import org.broadinstitute.barclay.help.DocWorkUnit; +import org.broadinstitute.barclay.help.DocWorkUnitHandler; import org.broadinstitute.barclay.help.DocumentedFeature; import org.broadinstitute.barclay.help.HelpDoclet; +import javax.lang.model.element.Element; import java.io.IOException; import java.util.Map; @@ -15,25 +17,17 @@ */ public class TestDoclet extends HelpDoclet { - public static boolean start(RootDoc rootDoc) { - try { - return new TestDoclet().startProcessDocs(rootDoc); - } catch (IOException e) { - throw new DocException("Exception processing javadoc", e); - } - } - @Override - protected DocWorkUnit createWorkUnit( - final DocumentedFeature documentedFeature, - final ClassDoc classDoc, - final Class clazz) + public DocWorkUnit createWorkUnit( + final Element classElement, + final Class clazz, + final DocumentedFeature documentedFeature) { return new DocWorkUnit( new TestDocWorkUnitHandler(this), - documentedFeature, - classDoc, - clazz); + classElement, + clazz, + documentedFeature); } /** diff --git a/src/test/java/org/broadinstitute/barclay/help/testinputs/TestArgumentContainer.java b/src/test/java/org/broadinstitute/barclay/help/testinputs/TestArgumentContainer.java index 30937108..ee3d0af6 100644 --- a/src/test/java/org/broadinstitute/barclay/help/testinputs/TestArgumentContainer.java +++ b/src/test/java/org/broadinstitute/barclay/help/testinputs/TestArgumentContainer.java @@ -197,6 +197,9 @@ public String getHelpDoc() { @Argument(fullName="enumCollection") List enumCollection = new ArrayList<>(); + @Argument(fullName="nonCLPEnumCollection") + List nonCLPEnumCollection = new ArrayList<>(); + /** * Mutually exclusive args */ diff --git a/src/test/java/org/broadinstitute/barclay/help/testinputs/TestNonCLPEnum.java b/src/test/java/org/broadinstitute/barclay/help/testinputs/TestNonCLPEnum.java new file mode 100644 index 00000000..44d4dabc --- /dev/null +++ b/src/test/java/org/broadinstitute/barclay/help/testinputs/TestNonCLPEnum.java @@ -0,0 +1,13 @@ +package org.broadinstitute.barclay.help.testinputs; + +public enum TestNonCLPEnum { + /** + * This is the NON_CLP_ENUM_VALUE_1 comment + */ + NON_CLP_ENUM_VALUE_1, + + /** + * This is the NON_CLP_ENUM_VALUE_2 comment + */ + NON_CLP_ENUM_VALUE_2 +} diff --git a/src/test/resources/org/broadinstitute/barclay/help/expected/BashTabCompletionDoclet/bashTabCompletionDocletTestLaunch-completion.sh b/src/test/resources/org/broadinstitute/barclay/help/expected/BashTabCompletionDoclet/bashTabCompletionDocletTestLaunch-completion.sh index 16393600..bf7d0f7b 100644 --- a/src/test/resources/org/broadinstitute/barclay/help/expected/BashTabCompletionDoclet/bashTabCompletionDocletTestLaunch-completion.sh +++ b/src/test/resources/org/broadinstitute/barclay/help/expected/BashTabCompletionDoclet/bashTabCompletionDocletTestLaunch-completion.sh @@ -442,13 +442,13 @@ _bashTabCompletionDocletTestLaunch_masterCompletionFunction() NUM_POSITIONAL_ARGUMENTS=2 POSITIONAL_ARGUMENT_TYPE=("List[File]") DEPENDENT_ARGUMENTS=() - NORMAL_COMPLETION_ARGUMENTS=(--enumCollection --requiredClpEnum --requiredFileList --requiredInputFilesFromArgCollection --requiredStringInputFromArgCollection --requiredStringList --usesFieldNameForArgName --deprecatedString --enumSetLong --fullAnonymousArgName --mutexSourceField --mutexTargetField1 --mutexTargetField2 --optionalClpEnum --optionalDouble --optionalDoubleList --optionalFileList --optionalFlag --optionalInputFilesFromArgCollection --optionalStringInputFromArgCollection --optionalStringList --testPlugin --advancedOptionalInt [NA - Positional] --deprecatedString ) + NORMAL_COMPLETION_ARGUMENTS=(--enumCollection --nonCLPEnumCollection --requiredClpEnum --requiredFileList --requiredInputFilesFromArgCollection --requiredStringInputFromArgCollection --requiredStringList --usesFieldNameForArgName --deprecatedString --enumSetLong --fullAnonymousArgName --mutexSourceField --mutexTargetField1 --mutexTargetField2 --optionalClpEnum --optionalDouble --optionalDoubleList --optionalFileList --optionalFlag --optionalInputFilesFromArgCollection --optionalStringInputFromArgCollection --optionalStringList --testPlugin --advancedOptionalInt [NA - Positional] --deprecatedString ) MUTUALLY_EXCLUSIVE_ARGS=("--mutexSourceField;mutexTargetField1,mutexTargetField2" "--mutexTargetField1;mutexSourceField" "--mutexTargetField2;mutexSourceField" ) SYNONYMOUS_ARGS=("--requiredClpEnum;-requiredClpEnum" "--requiredFileList;-reqFilList" "--requiredInputFilesFromArgCollection;-rRequiredInputFilesFromArgCollection" "--requiredStringInputFromArgCollection;-requiredStringInputFromArgCollection" "--requiredStringList;-reqStrList" "--deprecatedString;-depStr" "--enumSetLong;-ES" "--fullAnonymousArgName;-anonymousClassArg" "--mutexSourceField;-mutexSourceField" "--mutexTargetField1;-mutexTargetField1" "--mutexTargetField2;-mutexTargetField2" "--optionalClpEnum;-optionalClpEnum" "--optionalDouble;-optDouble" "--optionalDoubleList;-optDoubleList" "--optionalFileList;-optFilList" "--optionalFlag;-optFlag" "--optionalInputFilesFromArgCollection;-optionalInputFilesFromArgCollection" "--optionalStringInputFromArgCollection;-optionalStringInputFromArgCollection" "--optionalStringList;-optStrList" "--advancedOptionalInt;-advancedOptInt" "--deprecatedString;-depStr" ) - MIN_OCCURRENCES=(0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 ) - MAX_OCCURRENCES=(2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2 2147483647 ) - ALL_LEGAL_ARGUMENTS=(--enumCollection --requiredClpEnum --requiredFileList --requiredInputFilesFromArgCollection --requiredStringInputFromArgCollection --requiredStringList --usesFieldNameForArgName --deprecatedString --enumSetLong --fullAnonymousArgName --mutexSourceField --mutexTargetField1 --mutexTargetField2 --optionalClpEnum --optionalDouble --optionalDoubleList --optionalFileList --optionalFlag --optionalInputFilesFromArgCollection --optionalStringInputFromArgCollection --optionalStringList --testPlugin --advancedOptionalInt [NA - Positional] --deprecatedString ) - ALL_ARGUMENT_VALUE_TYPES=("List[TestEnum]" "TestEnum" "List[File]" "List[File]" "String" "List[String]" "String" "int" "EnumSet[TestEnum]" "List[File]" "List[File]" "List[File]" "List[File]" "TestEnum" "double" "List[Double]" "List[File]" "boolean" "List[File]" "String" "List[String]" "List[String]" "int" "List[File]" "int" ) + MIN_OCCURRENCES=(0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 ) + MAX_OCCURRENCES=(2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2 2147483647 ) + ALL_LEGAL_ARGUMENTS=(--enumCollection --nonCLPEnumCollection --requiredClpEnum --requiredFileList --requiredInputFilesFromArgCollection --requiredStringInputFromArgCollection --requiredStringList --usesFieldNameForArgName --deprecatedString --enumSetLong --fullAnonymousArgName --mutexSourceField --mutexTargetField1 --mutexTargetField2 --optionalClpEnum --optionalDouble --optionalDoubleList --optionalFileList --optionalFlag --optionalInputFilesFromArgCollection --optionalStringInputFromArgCollection --optionalStringList --testPlugin --advancedOptionalInt [NA - Positional] --deprecatedString ) + ALL_ARGUMENT_VALUE_TYPES=("List[TestEnum]" "List[TestNonCLPEnum]" "TestEnum" "List[File]" "List[File]" "String" "List[String]" "String" "int" "EnumSet[TestEnum]" "List[File]" "List[File]" "List[File]" "List[File]" "TestEnum" "double" "List[Double]" "List[File]" "boolean" "List[File]" "String" "List[String]" "List[String]" "int" "List[File]" "int" ) # Complete the arguments for this tool: _bashTabCompletionDocletTestLaunch_handleArgs diff --git a/src/test/resources/org/broadinstitute/barclay/help/expected/BashTabCompletionDoclet/bashTabCompletionDocletTestLaunchWithDefaults-completion.sh b/src/test/resources/org/broadinstitute/barclay/help/expected/BashTabCompletionDoclet/bashTabCompletionDocletTestLaunchWithDefaults-completion.sh index 7fbab950..0ce444f3 100644 --- a/src/test/resources/org/broadinstitute/barclay/help/expected/BashTabCompletionDoclet/bashTabCompletionDocletTestLaunchWithDefaults-completion.sh +++ b/src/test/resources/org/broadinstitute/barclay/help/expected/BashTabCompletionDoclet/bashTabCompletionDocletTestLaunchWithDefaults-completion.sh @@ -442,13 +442,13 @@ _bashTabCompletionDocletTestLaunchWithDefaults_masterCompletionFunction() NUM_POSITIONAL_ARGUMENTS=2 POSITIONAL_ARGUMENT_TYPE=("List[File]") DEPENDENT_ARGUMENTS=() - NORMAL_COMPLETION_ARGUMENTS=(--enumCollection --requiredClpEnum --requiredFileList --requiredInputFilesFromArgCollection --requiredStringInputFromArgCollection --requiredStringList --usesFieldNameForArgName --deprecatedString --enumSetLong --fullAnonymousArgName --mutexSourceField --mutexTargetField1 --mutexTargetField2 --optionalClpEnum --optionalDouble --optionalDoubleList --optionalFileList --optionalFlag --optionalInputFilesFromArgCollection --optionalStringInputFromArgCollection --optionalStringList --testPlugin --advancedOptionalInt [NA - Positional] --deprecatedString ) + NORMAL_COMPLETION_ARGUMENTS=(--enumCollection --nonCLPEnumCollection --requiredClpEnum --requiredFileList --requiredInputFilesFromArgCollection --requiredStringInputFromArgCollection --requiredStringList --usesFieldNameForArgName --deprecatedString --enumSetLong --fullAnonymousArgName --mutexSourceField --mutexTargetField1 --mutexTargetField2 --optionalClpEnum --optionalDouble --optionalDoubleList --optionalFileList --optionalFlag --optionalInputFilesFromArgCollection --optionalStringInputFromArgCollection --optionalStringList --testPlugin --advancedOptionalInt [NA - Positional] --deprecatedString ) MUTUALLY_EXCLUSIVE_ARGS=("--mutexSourceField;mutexTargetField1,mutexTargetField2" "--mutexTargetField1;mutexSourceField" "--mutexTargetField2;mutexSourceField" ) SYNONYMOUS_ARGS=("--requiredClpEnum;-requiredClpEnum" "--requiredFileList;-reqFilList" "--requiredInputFilesFromArgCollection;-rRequiredInputFilesFromArgCollection" "--requiredStringInputFromArgCollection;-requiredStringInputFromArgCollection" "--requiredStringList;-reqStrList" "--deprecatedString;-depStr" "--enumSetLong;-ES" "--fullAnonymousArgName;-anonymousClassArg" "--mutexSourceField;-mutexSourceField" "--mutexTargetField1;-mutexTargetField1" "--mutexTargetField2;-mutexTargetField2" "--optionalClpEnum;-optionalClpEnum" "--optionalDouble;-optDouble" "--optionalDoubleList;-optDoubleList" "--optionalFileList;-optFilList" "--optionalFlag;-optFlag" "--optionalInputFilesFromArgCollection;-optionalInputFilesFromArgCollection" "--optionalStringInputFromArgCollection;-optionalStringInputFromArgCollection" "--optionalStringList;-optStrList" "--advancedOptionalInt;-advancedOptInt" "--deprecatedString;-depStr" ) - MIN_OCCURRENCES=(0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 ) - MAX_OCCURRENCES=(2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2 2147483647 ) - ALL_LEGAL_ARGUMENTS=(--enumCollection --requiredClpEnum --requiredFileList --requiredInputFilesFromArgCollection --requiredStringInputFromArgCollection --requiredStringList --usesFieldNameForArgName --deprecatedString --enumSetLong --fullAnonymousArgName --mutexSourceField --mutexTargetField1 --mutexTargetField2 --optionalClpEnum --optionalDouble --optionalDoubleList --optionalFileList --optionalFlag --optionalInputFilesFromArgCollection --optionalStringInputFromArgCollection --optionalStringList --testPlugin --advancedOptionalInt [NA - Positional] --deprecatedString ) - ALL_ARGUMENT_VALUE_TYPES=("List[TestEnum]" "TestEnum" "List[File]" "List[File]" "String" "List[String]" "String" "int" "EnumSet[TestEnum]" "List[File]" "List[File]" "List[File]" "List[File]" "TestEnum" "double" "List[Double]" "List[File]" "boolean" "List[File]" "String" "List[String]" "List[String]" "int" "List[File]" "int" ) + MIN_OCCURRENCES=(0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 ) + MAX_OCCURRENCES=(2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2147483647 2 2147483647 ) + ALL_LEGAL_ARGUMENTS=(--enumCollection --nonCLPEnumCollection --requiredClpEnum --requiredFileList --requiredInputFilesFromArgCollection --requiredStringInputFromArgCollection --requiredStringList --usesFieldNameForArgName --deprecatedString --enumSetLong --fullAnonymousArgName --mutexSourceField --mutexTargetField1 --mutexTargetField2 --optionalClpEnum --optionalDouble --optionalDoubleList --optionalFileList --optionalFlag --optionalInputFilesFromArgCollection --optionalStringInputFromArgCollection --optionalStringList --testPlugin --advancedOptionalInt [NA - Positional] --deprecatedString ) + ALL_ARGUMENT_VALUE_TYPES=("List[TestEnum]" "List[TestNonCLPEnum]" "TestEnum" "List[File]" "List[File]" "String" "List[String]" "String" "int" "EnumSet[TestEnum]" "List[File]" "List[File]" "List[File]" "List[File]" "TestEnum" "double" "List[Double]" "List[File]" "boolean" "List[File]" "String" "List[String]" "List[String]" "int" "List[File]" "int" ) # Complete the arguments for this tool: _bashTabCompletionDocletTestLaunchWithDefaults_handleArgs diff --git a/src/test/resources/org/broadinstitute/barclay/help/expected/HelpDoclet/org_broadinstitute_barclay_help_testinputs_TestArgumentContainer.html b/src/test/resources/org/broadinstitute/barclay/help/expected/HelpDoclet/org_broadinstitute_barclay_help_testinputs_TestArgumentContainer.html index 7c1e1dbc..5d26c001 100644 --- a/src/test/resources/org/broadinstitute/barclay/help/expected/HelpDoclet/org_broadinstitute_barclay_help_testinputs_TestArgumentContainer.html +++ b/src/test/resources/org/broadinstitute/barclay/help/expected/HelpDoclet/org_broadinstitute_barclay_help_testinputs_TestArgumentContainer.html @@ -69,7 +69,7 @@

Overview

be tested. Test custom tag: - testType + {@MyTag.Type testType}

The purpose of this paragraph is to test embedded html formatting. @@ -119,6 +119,14 @@

TestArgumentContainer specific arguments

[] +Undocumented option + + + --nonCLPEnumCollection
+ + + [] + Undocumented option @@ -485,6 +493,29 @@

--mutexTargetField2  []

+

--nonCLPEnumCollection + +

+

+ +Undocumented option
+ +

+

+ The --nonCLPEnumCollection argument is an enumerated type (List[TestNonCLPEnum]), which can accept the following values: +

+
NON_CLP_ENUM_VALUE_1
+
This is the NON_CLP_ENUM_VALUE_1 comment
+
NON_CLP_ENUM_VALUE_2
+
This is the NON_CLP_ENUM_VALUE_2 comment
+
+

+

+ R + List[TestNonCLPEnum] +  [] +

+

--optionalClpEnum / -optionalClpEnum

diff --git a/src/test/resources/org/broadinstitute/barclay/help/expected/HelpDoclet/org_broadinstitute_barclay_help_testinputs_TestArgumentContainer.json b/src/test/resources/org/broadinstitute/barclay/help/expected/HelpDoclet/org_broadinstitute_barclay_help_testinputs_TestArgumentContainer.json index 31d9f365..1dec66f4 100644 --- a/src/test/resources/org/broadinstitute/barclay/help/expected/HelpDoclet/org_broadinstitute_barclay_help_testinputs_TestArgumentContainer.json +++ b/src/test/resources/org/broadinstitute/barclay/help/expected/HelpDoclet/org_broadinstitute_barclay_help_testinputs_TestArgumentContainer.json @@ -165,6 +165,31 @@ "deprecated": false, "options": [] }, + { + "summary": "Undocumented option", + "name": "--nonCLPEnumCollection", + "synonyms": "NA", + "type": "List[TestNonCLPEnum]", + "required": "yes", + "fulltext": "", + "defaultValue": "[]", + "minValue": "NA", + "maxValue": "NA", + "minRecValue": "NA", + "maxRecValue": "NA", + "kind": "required", + "deprecated": false, + "options": [ + { + "summary": "This is the NON_CLP_ENUM_VALUE_1 comment", + "name": "NON_CLP_ENUM_VALUE_1" + }, + { + "summary": "This is the NON_CLP_ENUM_VALUE_2 comment", + "name": "NON_CLP_ENUM_VALUE_2" + } + ] + }, { "summary": "Optional Clp enum", "name": "--optionalClpEnum", @@ -424,7 +449,7 @@ "options": [] } ], - "description": "Argument container class for testing documentation generation. Contains an argument\n for each @Argument, @ArgumentCollection, and @DocumentedFeature property that should\n be tested.\n\n Test custom tag:\n testType\n\n \u003cp\u003e\n The purpose of this paragraph is to test embedded html formatting.\n \u003col\u003e\n \u003cli\u003eThis is point number 1\u003c/li\u003e\n \u003cli\u003eThis is point number 2\u003c/li\u003e\n \u003c/ol\u003e\n \u003c/p\u003e", + "description": "Argument container class for testing documentation generation. Contains an argument\n for each @Argument, @ArgumentCollection, and @DocumentedFeature property that should\n be tested.\n\n Test custom tag:\n {@MyTag.Type testType}\n\n \u003cp\u003e\n The purpose of this paragraph is to test embedded html formatting.\n \u003col\u003e\n \u003cli\u003eThis is point number 1\u003c/li\u003e\n \u003cli\u003eThis is point number 2\u003c/li\u003e\n \u003c/ol\u003e\n \u003c/p\u003e", "name": "TestArgumentContainer", "group": "Test feature group name", "beta": true, diff --git a/src/test/resources/org/broadinstitute/barclay/help/expected/TestDoclet/org_broadinstitute_barclay_help_testinputs_TestArgumentContainer.html b/src/test/resources/org/broadinstitute/barclay/help/expected/TestDoclet/org_broadinstitute_barclay_help_testinputs_TestArgumentContainer.html index ce0aecfe..9b32ab85 100644 --- a/src/test/resources/org/broadinstitute/barclay/help/expected/TestDoclet/org_broadinstitute_barclay_help_testinputs_TestArgumentContainer.html +++ b/src/test/resources/org/broadinstitute/barclay/help/expected/TestDoclet/org_broadinstitute_barclay_help_testinputs_TestArgumentContainer.html @@ -73,7 +73,7 @@

Overview

be tested. Test custom tag: - + {@MyTag.Type testType}

The purpose of this paragraph is to test embedded html formatting. @@ -131,6 +131,14 @@

TestArgumentContainer specific arguments

[] +Undocumented option + + + --nonCLPEnumCollection
+ + + [] + Undocumented option @@ -490,6 +498,28 @@

--mutexTargetField2  []

+

--nonCLPEnumCollection + +

+

+ Undocumented option
+ +

+

+ The --nonCLPEnumCollection argument is an enumerated type (List[TestNonCLPEnum]), which can have one of the following values: +

+
NON_CLP_ENUM_VALUE_1
+
This is the NON_CLP_ENUM_VALUE_1 comment
+
NON_CLP_ENUM_VALUE_2
+
This is the NON_CLP_ENUM_VALUE_2 comment
+
+

+

+ R + List[TestNonCLPEnum] +  [] +

+

--optionalClpEnum / -optionalClpEnum

diff --git a/src/test/resources/org/broadinstitute/barclay/help/expected/TestDoclet/org_broadinstitute_barclay_help_testinputs_TestArgumentContainer.json b/src/test/resources/org/broadinstitute/barclay/help/expected/TestDoclet/org_broadinstitute_barclay_help_testinputs_TestArgumentContainer.json index 11cf8b2d..1dec66f4 100644 --- a/src/test/resources/org/broadinstitute/barclay/help/expected/TestDoclet/org_broadinstitute_barclay_help_testinputs_TestArgumentContainer.json +++ b/src/test/resources/org/broadinstitute/barclay/help/expected/TestDoclet/org_broadinstitute_barclay_help_testinputs_TestArgumentContainer.json @@ -165,6 +165,31 @@ "deprecated": false, "options": [] }, + { + "summary": "Undocumented option", + "name": "--nonCLPEnumCollection", + "synonyms": "NA", + "type": "List[TestNonCLPEnum]", + "required": "yes", + "fulltext": "", + "defaultValue": "[]", + "minValue": "NA", + "maxValue": "NA", + "minRecValue": "NA", + "maxRecValue": "NA", + "kind": "required", + "deprecated": false, + "options": [ + { + "summary": "This is the NON_CLP_ENUM_VALUE_1 comment", + "name": "NON_CLP_ENUM_VALUE_1" + }, + { + "summary": "This is the NON_CLP_ENUM_VALUE_2 comment", + "name": "NON_CLP_ENUM_VALUE_2" + } + ] + }, { "summary": "Optional Clp enum", "name": "--optionalClpEnum", @@ -424,7 +449,7 @@ "options": [] } ], - "description": "Argument container class for testing documentation generation. Contains an argument\n for each @Argument, @ArgumentCollection, and @DocumentedFeature property that should\n be tested.\n\n Test custom tag:\n \n\n \u003cp\u003e\n The purpose of this paragraph is to test embedded html formatting.\n \u003col\u003e\n \u003cli\u003eThis is point number 1\u003c/li\u003e\n \u003cli\u003eThis is point number 2\u003c/li\u003e\n \u003c/ol\u003e\n \u003c/p\u003e", + "description": "Argument container class for testing documentation generation. Contains an argument\n for each @Argument, @ArgumentCollection, and @DocumentedFeature property that should\n be tested.\n\n Test custom tag:\n {@MyTag.Type testType}\n\n \u003cp\u003e\n The purpose of this paragraph is to test embedded html formatting.\n \u003col\u003e\n \u003cli\u003eThis is point number 1\u003c/li\u003e\n \u003cli\u003eThis is point number 2\u003c/li\u003e\n \u003c/ol\u003e\n \u003c/p\u003e", "name": "TestArgumentContainer", "group": "Test feature group name", "beta": true, diff --git a/src/test/resources/org/broadinstitute/barclay/help/expected/WDLDoclet/org_broadinstitute_barclay_help_testinputs_TestArgumentContainer.json b/src/test/resources/org/broadinstitute/barclay/help/expected/WDLDoclet/org_broadinstitute_barclay_help_testinputs_TestArgumentContainer.json index 22f9d6b0..84937e8a 100644 --- a/src/test/resources/org/broadinstitute/barclay/help/expected/WDLDoclet/org_broadinstitute_barclay_help_testinputs_TestArgumentContainer.json +++ b/src/test/resources/org/broadinstitute/barclay/help/expected/WDLDoclet/org_broadinstitute_barclay_help_testinputs_TestArgumentContainer.json @@ -10,6 +10,7 @@ "TestArgumentContainer.positionalArgs": "Array[File]", "TestArgumentContainer.enumCollection": "Array[String]", + "TestArgumentContainer.nonCLPEnumCollection": "Array[String]", "TestArgumentContainer.requiredClpEnum": "String", "TestArgumentContainer.companionDictionary": "Array[String]", "TestArgumentContainer.companionIndex": "Array[String]", diff --git a/src/test/resources/org/broadinstitute/barclay/help/expected/WDLDoclet/org_broadinstitute_barclay_help_testinputs_TestArgumentContainer.wdl b/src/test/resources/org/broadinstitute/barclay/help/expected/WDLDoclet/org_broadinstitute_barclay_help_testinputs_TestArgumentContainer.wdl index 4a56c1aa..3170bb8a 100644 --- a/src/test/resources/org/broadinstitute/barclay/help/expected/WDLDoclet/org_broadinstitute_barclay_help_testinputs_TestArgumentContainer.wdl +++ b/src/test/resources/org/broadinstitute/barclay/help/expected/WDLDoclet/org_broadinstitute_barclay_help_testinputs_TestArgumentContainer.wdl @@ -18,6 +18,7 @@ version 1.0 # # Required Tool Arguments # enumCollection Undocumented option +# nonCLPEnumCollection Undocumented option # requiredClpEnum Required Clp enum # requiredFileList Required file list # companionDictionary Companion resource for requiredFileList @@ -68,6 +69,7 @@ workflow TestArgumentContainer { # Required Arguments Array[String] enumCollection + Array[String] nonCLPEnumCollection String requiredClpEnum Array[String] requiredFileList Array[String] companionDictionary @@ -121,6 +123,7 @@ workflow TestArgumentContainer { # Required Arguments enumCollection = enumCollection, + nonCLPEnumCollection = nonCLPEnumCollection, requiredClpEnum = requiredClpEnum, requiredFileList = requiredFileList, companionDictionary = companionDictionary, @@ -170,6 +173,7 @@ workflow TestArgumentContainer { # Required Arguments enumCollection: { description: "Undocumented option" } + nonCLPEnumCollection: { description: "Undocumented option" } requiredClpEnum: { description: "Required Clp enum" } requiredFileList: { description: "Required file list" } companionDictionary: { description: "Companion resource for requiredFileList" } @@ -210,6 +214,7 @@ task TestArgumentContainer { String bootdisksizegbRequirements Array[File] positionalArgs Array[String] enumCollection + Array[String] nonCLPEnumCollection String requiredClpEnum Array[String] requiredFileList Array[String] companionDictionary @@ -240,6 +245,7 @@ task TestArgumentContainer { ~{appLocation} TestArgumentContainer \ ~{sep=' ' positionalArgs} \ --enumCollection ~{sep=' --enumCollection ' enumCollection} \ + --nonCLPEnumCollection ~{sep=' --nonCLPEnumCollection ' nonCLPEnumCollection} \ --requiredClpEnum ~{sep=' --requiredClpEnum ' requiredClpEnum} \ --requiredFileList ~{sep=' --requiredFileList ' requiredFileList} \ --requiredInputFilesFromArgCollection ~{sep=' --requiredInputFilesFromArgCollection ' requiredInputFilesFromArgCollection} \ @@ -294,6 +300,7 @@ task TestArgumentContainer { # Required Arguments enumCollection: { description: "Undocumented option" } + nonCLPEnumCollection: { description: "Undocumented option" } requiredClpEnum: { description: "Required Clp enum" } requiredFileList: { description: "Required file list" } companionDictionary: { description: "Companion resource for requiredFileList" }