Produced by Araxis Merge on 3/25/2019 8:58:06 AM 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\IMAG_Source\VISA\Java\ViewerImagingWebApp\main\src\java\gov\va\med\imaging\viewer\rest | ViewerImagingFilterService.java | Mon Mar 18 20:39:08 2019 UTC |
2 | C:\AraxisMergeCompare\Pri_re\IMAG_Source\VISA\Java\ViewerImagingWebApp\main\src\java\gov\va\med\imaging\viewer\rest | ViewerImagingFilterService.java | Tue Mar 19 12:04:12 2019 UTC |
Description | Between Files 1 and 2 |
|
---|---|---|
Text Blocks | Lines | |
Unchanged | 3 | 206 |
Changed | 2 | 4 |
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 | * Date Cr eated: Apr 23, 2018 | |
3 | * Develop er: DNS tjahjb | |
4 | */ | |
5 | package go v.va.med.i maging.vie wer.rest; | |
6 | ||
7 | import gov .va.med.im aging.core .interface s.exceptio ns.Connect ionExcepti on; | |
8 | import gov .va.med.im aging.core .interface s.exceptio ns.MethodE xception; | |
9 | import gov .va.med.im aging.view er.ViewerI magingCont extHolder; | |
10 | import gov .va.med.im aging.view er.command s.DeleteIm ageFilterC ommand; | |
11 | import gov .va.med.im aging.view er.command s.GetImage FilterDeta ilCommand; | |
12 | import gov .va.med.im aging.view er.command s.GetImage FiltersCom mand; | |
13 | import gov .va.med.im aging.view er.command s.SaveImag eFilterCom mand; | |
14 | import gov .va.med.im aging.view er.rest.en dpoints.Vi ewerImagin gRestUri; | |
15 | import gov .va.med.im aging.view er.rest.ty pes.ImageF ilterField ValuesType ; | |
16 | import gov .va.med.im aging.web. rest.excep tions.Abst ractRestSe rvice; | |
17 | ||
18 | import jav ax.ws.rs.C onsumes; | |
19 | import jav ax.ws.rs.G ET; | |
20 | import jav ax.ws.rs.P OST; | |
21 | import jav ax.ws.rs.P ath; | |
22 | import jav ax.ws.rs.P roduces; | |
23 | import jav ax.ws.rs.Q ueryParam; | |
24 | import jav ax.ws.rs.c ore.MediaT ype; | |
25 | import jav ax.ws.rs.c ore.Respon se; | |
26 | ||
27 | /** | |
28 | * @author DNS tjahjb | |
29 | * | |
30 | */ | |
31 | @Path(View erImagingR estUri.vie werImaging FilterServ icePath) | |
32 | public cla ss ViewerI magingFilt erService | |
33 | extends Ab stractRest Service | |
34 | { | |
35 | @GET | |
36 | @P ath(Viewer ImagingRes tUri.viewe rImagingGe tImageFilt ersMethodP ath) | |
37 | @Produ ces(MediaT ype.APPLIC ATION_XML) | |
38 | pu blic Respo nse getIma geFilters( | |
39 | @QueryPa ram("userI d") String userId) | |
40 | throws MethodExc eption, Co nnectionEx ception | |
41 | { | |
42 | re turn wrapR esultWithR esponseHea ders( | |
43 | new GetI mageFilter sCommand( | |
44 | ge tLocalSite Number(), | |
45 | us erId, | |
46 | ge tInterface Version()) .execute() ); | |
47 | } | |
48 | ||
49 | ||
50 | @G ET | |
51 | @P ath(Viewer ImagingRes tUri.viewe rImagingGe tImageFilt erDetailMe thodPath) | |
52 | @P roduces(Me diaType.AP PLICATION_ XML) | |
53 | pu blic Respo nse getIma geFilterDe tail( | |
54 | @QueryPa ram("filte rIen") Str ing filter Ien, | |
55 | @QueryPa ram("filte rName") St ring filte rName, | |
56 | @QueryPa ram("userI d") String userId | |
57 | ) | |
58 | th rows Metho dException , Connecti onExceptio n | |
59 | { | |
60 | retu rn wrapRes ultWithRes ponseHeade rs( | |
61 | new GetI mageFilter DetailComm and( | |
62 | ge tLocalSite Number(), | |
63 | fi lterIen, f ilterName, userId, | |
64 | ge tInterface Version()) .execute() ); | |
65 | } | |
66 | ||
67 | @G ET | |
68 | @P ath(Viewer ImagingRes tUri.viewe rImagingDe leteImageF ilterMetho dPath) | |
69 | @P roduces(Me diaType.AP PLICATION_ XML) | |
70 | pu blic Respo nse delete ImageFilte r( | |
71 | @QueryPa ram("filte rIen") Str ing filter Ien | |
72 | ) | |
73 | th rows Metho dException , Connecti onExceptio n | |
74 | { | |
75 | retu rn wrapRes ultWithRes ponseHeade rs( | |
76 | new Dele teImageFil terCommand ( | |
77 | ge tLocalSite Number(), | |
78 | fi lterIen, | |
79 | ge tInterface Version()) .execute() ); | |
80 | } | |
81 | ||
82 | @P OST | |
83 | @P ath(Viewer ImagingRes tUri.viewe rImagingSa veImageFil terMethodP ath) | |
84 | @P roduces(Me diaType.AP PLICATION_ XML) | |
85 | @C onsumes(Me diaType.AP PLICATION_ XML) | |
86 | pu blic Respo nse saveIm ageFilter( ImageFilte rFieldValu esType ima geFilterFi eldValues) | |
87 | th rows Metho dException , Connecti onExceptio n | |
88 | { | |
89 | retu rn wrapRes ultWithRes ponseHeade rs( | |
90 | new Save ImageFilte rCommand( | |
91 | ge tLocalSite Number(), | |
92 | im ageFilterF ieldValues , | |
93 | ge tInterface Version()) .execute() ); | |
94 | } | |
95 | ||
96 | pr otected St ring getIn terfaceVer sion() | |
97 | { | |
98 | retu rn "V1"; | |
99 | } | |
100 | ||
101 | pr otected St ring getLo calSiteNum ber() | |
102 | { | |
103 | retu rn ViewerI magingCont extHolder. getViewerI magingCont ext().getA ppConfigur ation().ge tLocalSite Number(); | |
104 | } | |
105 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.