Produced by Araxis Merge on 7/10/2017 1:01:47 PM Central Daylight Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | C:\AraxisMergeCompare\Pri_un\IV-ehmp_cif\ViewerStudyWebApp\main\generated\java\gov\va\med\imaging\study\web | ViewerStudyFacadeRouterTest.java | Thu Jun 29 17:22:47 2017 UTC |
| 2 | C:\AraxisMergeCompare\Pri_re\IV-ehmp_cif\ViewerStudyWebApp\main\generated\java\gov\va\med\imaging\study\web | ViewerStudyFacadeRouterTest.java | Thu Jul 6 15:05:35 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 2 | 456 |
| Changed | 1 | 2 |
| Inserted | 0 | 0 |
| Removed | 0 | 0 |
| Whitespace | |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| CR/LF characters | Not shown in the comparison detail |
No regular expressions were active.
| 1 | /** | |
| 2 | * Package : MAG - Vi stA Imagin g | |
| 3 | * WARNING : Per VHA Directive 2004-038, this routi ne should not be mod ified. | |
| 4 | * Date Cr eated: Oct 1, 2008 | |
| 5 | * Site Na me: Washi ngton OI F ield Offic e, Silver Spring, MD | |
| 6 | * @author
|
|
| 7 | * @versio n 1.0 | |
| 8 | * | |
| 9 | * ------- ---------- ---------- ---------- ---------- ---------- ------- | |
| 10 | * Propert y of the U S Governme nt. | |
| 11 | * No perm ission to copy or re distribute this soft ware is gi ven. | |
| 12 | * Use of unreleased versions of this so ftware req uires the user | |
| 13 | * to exec ute a writ ten test a greement w ith the Vi stA Imagin g | |
| 14 | * Develop ment Offic e of the D epartment of Veteran s Affairs, | |
| 15 | * telepho ne (301) 7 34-0100. | |
| 16 | * | |
| 17 | * The Foo d and Drug Administr ation clas sifies thi s software as | |
| 18 | * a Class II medica l device. As such, it may not be change d | |
| 19 | * in any way. Modi fications to this so ftware may result in an | |
| 20 | * adulter ated medic al device under 21CF R820, the use of whi ch | |
| 21 | * is cons idered to be a viola tion of US Federal S tatutes. | |
| 22 | * ------- ---------- ---------- ---------- ---------- ---------- ------- | |
| 23 | */ | |
| 24 | package g ov.va.med. imaging.st udy.web; | |
| 25 | ||
| 26 | import ja va.util.Da te; | |
| 27 | import or g.apache.l og4j.*; | |
| 28 | import go v.va.med.i maging.*; | |
| 29 | import go v.va.med.i maging.cor e.interfac es.excepti ons.*; | |
| 30 | import go v.va.med.i maging.cor e.interfac es.router. Command; | |
| 31 | import go v.va.med.i maging.cor e.interfac es.router. CommandFac tory; | |
| 32 | import go v.va.med.i maging.cor e.CommandF actoryImpl ; | |
| 33 | import go v.va.med.i maging.cor e.interfac es.router. Asynchrono usCommandR esultListe ner; | |
| 34 | import go v.va.med.e xceptions. Validation Exception; | |
| 35 | import ja vax.annota tion.Gener ated; | |
| 36 | import go v.va.med.i maging.cor e.interfac es.router. CommandCon text; | |
| 37 | ||
| 38 | import go v.va.med.i maging.exc hange.busi ness.*; | |
| 39 | import go v.va.med.i maging.exc hange.busi ness.dicom .*; | |
| 40 | import go v.va.med.i maging.exc hange.busi ness.vista rad.*; | |
| 41 | import go v.va.med.i maging.art ifactsourc e.*; | |
| 42 | ||
| 43 | /* | |
| 44 | * This is generated code and is recreat ed on ever y build. | |
| 45 | * Do not make chang es directl y in this code, as t hey will b e lost (wi thout warn ing). | |
| 46 | * Changes may be ma de to the template t hat genera ted this c ode (Facad eRouterImp l.ftl in | |
| 47 | * the Cor eRouterAnn otationPro cessor pro ject), suc h changes will be re flected in | |
| 48 | * all fac ade router implement ations. | |
| 49 | * | |
| 50 | * This co de was gen erated usi ng FreeMar ker, an op en-source template p rocessing engine. | |
| 51 | * See htt p://www.fr eemarker.o rg for doc umentation on the te mplate syn tax. | |
| 52 | */ | |
| 53 | @Generate d(value="g ov.va.med. imaging.co re.codegen erator.Fac adeRouterC odeGenerat or") | |
| 54 | public cl ass Viewer StudyFacad eRouterTes t | |
| 55 | //extends gov.va.me d.imaging. core.inter faces.rout er.Abstrac tFacadeRou terImpl | |
| 56 | { | |
| 57 | ||
| 58 | pr ivate Logg er logger = Logger.g etLogger(t his.getCla ss()); | |
| 59 | ||
| 60 | pr ivate Logg er getLogg er() | |
| 61 | { | |
| 62 | retu rn logger; | |
| 63 | } | |
| 64 | ||
| 65 | pr ivate Comm andFactory commandFa ctory = ne w CommandF actoryImpl ((CommandC ontext)nul l); | |
| 66 | pr ivate Comm andFactory getComman dFactory() | |
| 67 | { | |
| 68 | retu rn command Factory; | |
| 69 | } | |
| 70 | ||
| 71 | /* * | |
| 72 | * The constr uctor is p ublic so t his tester can be cr eated to t est | |
| 73 | */ | |
| 74 | pu blic Viewe rStudyFaca deRouterTe st() | |
| 75 | { | |
| 76 | supe r(); | |
| 77 | } | |
| 78 | ||
| 79 | /* | |
| 80 | * Generated method, mo dification s will be overwritte n when pro ject is bu ilt | |
| 81 | * | |
| 82 | * The templa te for thi s method m ay be foun d in Facad eRouterSyn chronousCo llectionMe thodImpl.f tl | |
| 83 | */ | |
| 84 | @S uppressWar nings("unc hecked") | |
| 85 | pu blic void getStudies ByCprsIden tifier( | |
| 86 | java.l ang.String patientIc n | |
| 87 | , gov.va.m ed.Routing Token rout ingToken | |
| 88 | , gov.va.m ed.imaging .CprsIdent ifier cprs Identifier | |
| 89 | ) | |
| 90 | thro ws Validat ionExcepti on | |
| 91 | { | |
| 92 | getLog ger().info ("Searchin g for comm and 'GetSt udiesByCpr sIdentifie rCommand' and parame ters 'java .lang.Stri ng, gov.va .med.Routi ngToken, g ov.va.med. imaging.Cp rsIdentifi er'."); | |
| 93 | boolea n result = getComman dFactory() .isCollect ionCommand Supported( | |
| 94 | java.ut il.List.cl ass, | |
| 95 | gov.va. med.imagin g.exchange .business. Study.clas s, | |
| 96 | "GetStud iesByCprsI dentifierC ommand", | |
| 97 | "", | |
| 98 | new Clas s<?>[]{ | |
| 99 | java.lang. String.cla ss, gov.va .med.Routi ngToken.cl ass, gov.v a.med.imag ing.CprsId entifier.c lass | |
| 100 | }, | |
| 101 | new Obje ct[]{ | |
| 102 | patientIcn ,routingTo ken,cprsId entifier | |
| 103 | } | |
| 104 | ); | |
| 105 | ||
| 106 | if(!re sult) | |
| 107 | throw ne w Validati onExceptio n("Cannot create com mand 'GetS tudiesByCp rsIdentifi erCommand' in method 'getStudi esByCprsId entifier' with param eters 'jav a.lang.Str ing, gov.v a.med.Rout ingToken, gov.va.med .imaging.C prsIdentif ier'."); | |
| 108 | } | |
| 109 | ||
| 110 | /* | |
| 111 | * Generated method, mo dification s will be overwritte n when pro ject is bu ilt | |
| 112 | * | |
| 113 | * The templa te for thi s method m ay be foun d in Facad eRouterSyn chronousMe thodImpl.f tl | |
| 114 | */ | |
| 115 | @S uppressWar nings("unc hecked") | |
| 116 | pu blic void getUserTok en( | |
| 117 | ) | |
| 118 | thro ws Validat ionExcepti on | |
| 119 | { | |
| 120 | getLog ger().info ("Searchin g for comm and 'GetUs erTokenCom mand' and parameters ''."); | |
| 121 | boolean result = g etCommandF actory().i sCommandSu pported( | |
| 122 | java.lang .String.cl ass, | |
| 123 | "GetUserTo kenCommand ", | |
| 124 | "", | |
| 125 | new Class< ?>[]{ | |
| 126 | ||
| 127 | }, | |
| 128 | new Object []{ | |
| 129 | ||
| 130 | } | |
| 131 | ); | |
| 132 | if(!resu lt) | |
| 133 | throw new Validation Exception( "Cannot cr eate comma nd 'GetUse rTokenComm and' in me thod 'getU serToken' with param eters ''." ); | |
| 134 | } | |
| 135 | ||
| 136 | /* | |
| 137 | * Generated method, mo dification s will be overwritte n when pro ject is bu ilt | |
| 138 | * | |
| 139 | * The templa te for thi s method m ay be foun d in Facad eRouterSyn chronousCo llectionMe thodImpl.f tl | |
| 140 | */ | |
| 141 | @S uppressWar nings("unc hecked") | |
| 142 | pu blic void getShallow StudyListB ySiteNumbe r( | |
| 143 | gov.va .med.Routi ngToken ro utingToken | |
| 144 | , java.lan g.String p atientIcn | |
| 145 | , gov.va.m ed.imaging .exchange. business.S tudyFilter filter | |
| 146 | ) | |
| 147 | thro ws Validat ionExcepti on | |
| 148 | { | |
| 149 | getLog ger().info ("Searchin g for comm and 'GetSh allowStudy ListBySite NumberComm and' and p arameters 'gov.va.me d.RoutingT oken, java .lang.Stri ng, gov.va .med.imagi ng.exchang e.business .StudyFilt er'."); | |
| 150 | boolea n result = getComman dFactory() .isCollect ionCommand Supported( | |
| 151 | java.ut il.List.cl ass, | |
| 152 | gov.va. med.imagin g.exchange .business. Study.clas s, | |
| 153 | "GetShal lowStudyLi stBySiteNu mberComman d", | |
| 154 | "", | |
| 155 | new Clas s<?>[]{ | |
| 156 | gov.va.med .RoutingTo ken.class, java.lang .String.cl ass, gov.v a.med.imag ing.exchan ge.busines s.StudyFil ter.class | |
| 157 | }, | |
| 158 | new Obje ct[]{ | |
| 159 | routingTok en,patient Icn,filter | |
| 160 | } | |
| 161 | ); | |
| 162 | ||
| 163 | if(!re sult) | |
| 164 | throw ne w Validati onExceptio n("Cannot create com mand 'GetS hallowStud yListBySit eNumberCom mand' in m ethod 'get ShallowStu dyListBySi teNumber' with param eters 'gov .va.med.Ro utingToken , java.lan g.String, gov.va.med .imaging.e xchange.bu siness.Stu dyFilter'. "); | |
| 165 | } | |
| 166 | ||
| 167 | /* | |
| 168 | * Generated method, mo dification s will be overwritte n when pro ject is bu ilt | |
| 169 | * | |
| 170 | * The templa te for thi s method m ay be foun d in Facad eRouterSyn chronousMe thodImpl.f tl | |
| 171 | */ | |
| 172 | @S uppressWar nings("unc hecked") | |
| 173 | pu blic void getStudyWi thImagesBy StudyURN( | |
| 174 | gov.va .med.Routi ngToken ro utingToken | |
| 175 | , gov.va.m ed.Patient Identifier patientId entifier | |
| 176 | , gov.va.m ed.imaging .exchange. business.S tudyFilter filter | |
| 177 | , boolean includeRad iology | |
| 178 | , boolean includeDoc uments | |
| 179 | ) | |
| 180 | thro ws Validat ionExcepti on | |
| 181 | { | |
| 182 | getLog ger().info ("Searchin g for comm and 'GetSt udyWithIma gesArtifac tResultsBy SiteNumber Command' a nd paramet ers 'gov.v a.med.Rout ingToken, gov.va.med .PatientId entifier, gov.va.med .imaging.e xchange.bu siness.Stu dyFilter, boolean, b oolean'.") ; | |
| 183 | boolean result = g etCommandF actory().i sCommandSu pported( | |
| 184 | gov.va.me d.imaging. exchange.b usiness.Ar tifactResu lts.class, | |
| 185 | "GetStudyW ithImagesA rtifactRes ultsBySite NumberComm and", | |
| 186 | "", | |
| 187 | new Class< ?>[]{ | |
| 188 | g ov.va.med. RoutingTok en.class, gov.va.med .PatientId entifier.c lass, gov. va.med.ima ging.excha nge.busine ss.StudyFi lter.class , boolean. class, boo lean.class | |
| 189 | }, | |
| 190 | new Object []{ | |
| 191 | ro utingToken ,patientId entifier,f ilter,incl udeRadiolo gy,include Documents | |
| 192 | } | |
| 193 | ); | |
| 194 | if(!resu lt) | |
| 195 | throw new Validation Exception( "Cannot cr eate comma nd 'GetStu dyWithImag esArtifact ResultsByS iteNumberC ommand' in method 'g etStudyWit hImagesByS tudyURN' w ith parame ters 'gov. va.med.Rou tingToken, gov.va.me d.PatientI dentifier, gov.va.me d.imaging. exchange.b usiness.St udyFilter, boolean, boolean'." ); | |
| 196 | } | |
| 197 | ||
| 198 | /* | |
| 199 | * Generated method, mo dification s will be overwritte n when pro ject is bu ilt | |
| 200 | * | |
| 201 | * The templa te for thi s method m ay be foun d in Facad eRouterSyn chronousMe thodImpl.f tl | |
| 202 | */ | |
| 203 | @S uppressWar nings("unc hecked") | |
| 204 | pu blic void getStudyOn lyByStudyU RN( | |
| 205 | gov.va .med.Routi ngToken ro utingToken | |
| 206 | , gov.va.m ed.Patient Identifier patientId entifier | |
| 207 | , gov.va.m ed.imaging .exchange. business.S tudyFilter filter | |
| 208 | , boolean includeRad iology | |
| 209 | , boolean includeDoc uments | |
| 210 | ) | |
| 211 | thro ws Validat ionExcepti on | |
| 212 | { | |
| 213 | getLog ger().info ("Searchin g for comm and 'GetSt udyOnlyArt ifactResul tsBySiteNu mberComman d' and par ameters 'g ov.va.med. RoutingTok en, gov.va .med.Patie ntIdentifi er, gov.va .med.imagi ng.exchang e.business .StudyFilt er, boolea n, boolean '."); | |
| 214 | boolean result = g etCommandF actory().i sCommandSu pported( | |
| 215 | gov.va.me d.imaging. exchange.b usiness.Ar tifactResu lts.class, | |
| 216 | "GetStudyO nlyArtifac tResultsBy SiteNumber Command", | |
| 217 | "", | |
| 218 | new Class< ?>[]{ | |
| 219 | g ov.va.med. RoutingTok en.class, gov.va.med .PatientId entifier.c lass, gov. va.med.ima ging.excha nge.busine ss.StudyFi lter.class , boolean. class, boo lean.class | |
| 220 | }, | |
| 221 | new Object []{ | |
| 222 | ro utingToken ,patientId entifier,f ilter,incl udeRadiolo gy,include Documents | |
| 223 | } | |
| 224 | ); | |
| 225 | if(!resu lt) | |
| 226 | throw new Validation Exception( "Cannot cr eate comma nd 'GetStu dyOnlyArti factResult sBySiteNum berCommand ' in metho d 'getStud yOnlyByStu dyURN' wit h paramete rs 'gov.va .med.Routi ngToken, g ov.va.med. PatientIde ntifier, g ov.va.med. imaging.ex change.bus iness.Stud yFilter, b oolean, bo olean'."); | |
| 227 | } | |
| 228 | ||
| 229 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.