48. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 6/5/2018 10:24:14 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.

48.1 Files compared

# Location File Last Modified
1 patch_205_build_9.zip\Java\ViewerImagingWebApp\main\src\java\gov\va\med\imaging\viewer\rest ViewerImagingService.java Wed May 30 14:35:27 2018 UTC
2 patch_205_build_9.zip\Java\ViewerImagingWebApp\main\src\java\gov\va\med\imaging\viewer\rest ViewerImagingService.java Mon Jun 4 20:26:29 2018 UTC

48.2 Comparison summary

Description Between
Files 1 and 2
Text Blocks Lines
Unchanged 3 332
Changed 2 4
Inserted 0 0
Removed 0 0

48.3 Comparison options

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

48.4 Active regular expressions

No regular expressions were active.

48.5 Comparison detail

  1   /**
  2    * Date Cr eated: Apr  25, 2017
  3    * Develop er:  PII
  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.rest .types.Res tBooleanRe turnType;
  10   import gov .va.med.im aging.view er.ViewerI magingCont extHolder;
  11   import gov .va.med.im aging.view er.command s.DeleteIm agesComman d;
  12   import gov .va.med.im aging.view er.command s.FlagImag esAsSensit iveCommand ;
  13   import gov .va.med.im aging.view er.command s.GetDelet eReasonsCo mmand;
  14   import gov .va.med.im aging.view er.command s.GetPrint ReasonsCom mand;
  15   import gov .va.med.im aging.view er.command s.GetTreat ingFacilit iesCommand ;
  16   import gov .va.med.im aging.view er.command s.GetUserI nformation ByUserIdCo mmand;
  17   import gov .va.med.im aging.view er.command s.LogAcces sImageUrns Command;
  18   import gov .va.med.im aging.view er.command s.LogPrint ImageAcces sCommand;
  19   import gov .va.med.im aging.view er.rest.en dpoints.Vi ewerImagin gRestUri;
  20   import gov .va.med.im aging.view er.rest.ty pes.Delete ImageUrnsT ype;
  21   import gov .va.med.im aging.view er.rest.ty pes.FlagSe nsitiveIma geUrnsType ;
  22   import gov .va.med.im aging.view er.rest.ty pes.LogAcc essImageUr nsType;
  23   import gov .va.med.im aging.view er.rest.ty pes.UserIn foType;
  24   import gov .va.med.im aging.web. rest.excep tions.Abst ractRestSe rvice;
  25  
  26   import jav ax.ws.rs.C onsumes;
  27   import jav ax.ws.rs.G ET;
  28   import jav ax.ws.rs.P OST;
  29   import jav ax.ws.rs.P ath;
  30   import jav ax.ws.rs.P roduces;
  31   import jav ax.ws.rs.Q ueryParam;
  32   import jav ax.ws.rs.c ore.MediaT ype;
  33   import jav ax.ws.rs.c ore.Respon se;
  34  
  35   /**
  36    * @author   PII
  37    *
  38    */
  39   @Path(View erImagingR estUri.vie werImaging ServicePat h)
  40   public cla ss ViewerI magingServ ice
  41   extends Ab stractRest Service
  42   {
  43       @GET
  44           @P ath(Viewer ImagingRes tUri.viewe rImagingGe tUserInfor mationMeth odPath)
  45       @Produ ces(MediaT ype.APPLIC ATION_XML)
  46           pu blic UserI nfoType ge tUserInfor mation(
  47                @QueryPa ram("siteI d") String  siteId,
  48                @QueryPa ram("userI d") String  userId)
  49       throws  MethodExc eption, Co nnectionEx ception
  50       {
  51          Get UserInform ationByUse rIdCommand  command =  new GetUs erInformat ionByUserI dCommand(s iteId, use rId, "1.0" );
  52          ret urn comman d.execute( );
  53           }
  54           
  55           
  56           @P OST
  57           @P ath(Viewer ImagingRes tUri.viewe rImagingDe leteImages MethodPath
  58           @P roduces(Me diaType.AP PLICATION_ XML)
  59           @C onsumes(Me diaType.AP PLICATION_ XML)
  60           pu blic Respo nse delete Images(Del eteImageUr nsType ima geUrns)
  61           th rows Metho dException , Connecti onExceptio n
  62           {
  63                    retu rn wrapRes ultWithRes ponseHeade rs(
  64                                      new Dele teImagesCo mmand(
  65                                                       ge tLocalSite Number(), 
  66                                                       im ageUrns, 
  67                                                       ge tInterface Version()) .execute() );
  68           }
  69  
  70           @G ET
  71           @P ath(Viewer ImagingRes tUri.viewe rImagingGe tDeleteRea sonsMethod Path) 
  72           @P roduces(Me diaType.AP PLICATION_ XML)
  73           pu blic Respo nse getDel eteReasons ()
  74           th rows Metho dException , Connecti onExceptio n
  75           {
  76                    retu rn wrapRes ultWithRes ponseHeade rs(
  77                                      new GetD eleteReaso nsCommand(
  78                                                       ge tLocalSite Number(), 
  79                                                       ge tInterface Version()) .execute() );
  80           }
  81  
  82           @G ET
  83           @P ath(Viewer ImagingRes tUri.viewe rImagingGe tPrintReas onsMethodP ath) 
  84           @P roduces(Me diaType.AP PLICATION_ XML)
  85           pu blic Respo nse getPri ntReasons( )
  86           th rows Metho dException , Connecti onExceptio n
  87           {
  88                    retu rn wrapRes ultWithRes ponseHeade rs(
  89                                      new GetP rintReason sCommand(
  90                                                       ge tLocalSite Number(), 
  91                                                       ge tInterface Version()) .execute() );
  92           }
  93  
  94           @P OST
  95           @P ath(Viewer ImagingRes tUri.viewe rImagingFl agImagesAs SensitiveM ethodPath)  
  96           @P roduces(Me diaType.AP PLICATION_ XML)
  97           @C onsumes(Me diaType.AP PLICATION_ XML)
  98           pu blic Respo nse flagIm agesAsSens itive(Flag SensitiveI mageUrnsTy pe imageUr ns)
  99           th rows Metho dException , Connecti onExceptio n
  100           {
  101                    retu rn wrapRes ultWithRes ponseHeade rs(
  102                                      new Flag ImagesAsSe nsitiveCom mand(
  103                                                       ge tLocalSite Number(), 
  104                                                       im ageUrns, 
  105                                                       ge tInterface Version()) .execute() );
  106           }
  107           
  108           @P OST
  109           @P ath(Viewer ImagingRes tUri.viewe rImagingLo gImageAcce ssMethodPa th) 
  110           @P roduces(Me diaType.AP PLICATION_ XML)
  111           @C onsumes(Me diaType.AP PLICATION_ XML)
  112           pu blic Respo nse logIma geAccess(
  113                             @Query Param("icn ") String  patientIcn ,
  114                             @Query Param("dfn ") String  patientDfn ,
  115                             LogAcc essImageUr nsType ima geUrns)
  116           th rows Metho dException , Connecti onExceptio n
  117           {
  118                    retu rn wrapRes ultWithRes ponseHeade rs(
  119                                      new LogA ccessImage UrnsComman d(
  120                                                       ge tLocalSite Number(), 
  121                                                       pa tientIcn,
  122                                                       pa tientDfn,
  123                                                       im ageUrns, 
  124                                                       ge tInterface Version()) .execute() );
  125           }
  126           
  127       @GET
  128           @P ath(Viewer ImagingRes tUri.viewe rImagingLo gPrintImag eAccessMet hodPath)
  129       @Produ ces(MediaT ype.APPLIC ATION_XML)
  130           pu blic RestB ooleanRetu rnType log PrintImage AccessEven t(
  131                @QueryPa ram("siteI d") String  siteId,
  132                @QueryPa ram("image Urn") Stri ng imageUr n,
  133                @QueryPa ram("reaso n") String  printReas on)
  134       throws  MethodExc eption, Co nnectionEx ception
  135       {
  136          Log PrintImage AccessComm and comman d = new Lo gPrintImag eAccessCom mand(siteI d, imageUr n, printRe ason, "1.0 ");
  137          ret urn comman d.execute( );
  138           }
  139  
  140       
  141       @GET
  142           @P ath(Viewer ImagingRes tUri.viewe rImagingGe tTreatingF acilitiesM ethodPath)
  143       @Produ ces(MediaT ype.APPLIC ATION_XML)
  144           pu blic Respo nse getTre atingFacil ities(
  145                @QueryPa ram("siteI d") String  siteId,
  146                             @Query Param("icn ") String  patientIcn ,
  147                             @Query Param("dfn ") String  patientDfn )
  148       throws  MethodExc eption, Co nnectionEx ception
  149       {
  150           re turn wrapR esultWithR esponseHea ders(new G etTreating Facilities Command(
  151                       s iteId, 
  152                       p atientIcn,  
  153                       p atientDfn,
  154                       g etInterfac eVersion() ).execute( ));
  155           }
  156  
  157       
  158       
  159           pr otected St ring getIn terfaceVer sion()
  160           {
  161                    retu rn "V1";
  162           }
  163  
  164           pr otected St ring getLo calSiteNum ber()
  165           {
  166                    retu rn ViewerI magingCont extHolder. getViewerI magingCont ext().getA ppConfigur ation().ge tLocalSite Number();
  167           }
  168   }