99. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 12/20/2017 5:56:12 PM Eastern Standard 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.

99.1 Files compared

# Location File Last Modified
1 Genisis_2.0_v6_bld6.zip\Source Code\UI\Services\src\main\java\gov\va\genisis2\converter RequestHistoryConverter.java Thu Dec 14 19:57:07 2017 UTC
2 Genisis_2.0_v6_bld6.zip\Source Code\UI\Services\src\main\java\gov\va\genisis2\converter RequestHistoryConverter.java Wed Dec 20 22:09:04 2017 UTC

99.2 Comparison summary

Description Between
Files 1 and 2
Text Blocks Lines
Unchanged 2 262
Changed 1 2
Inserted 0 0
Removed 0 0

99.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

99.4 Active regular expressions

No regular expressions were active.

99.5 Comparison detail

  1   package go v.va.genis is2.conver ter;
  2  
  3   import jav a.util.Has hSet;
  4   import jav a.util.Lis t;
  5   import jav a.util.Set ;
  6  
  7   import org .springfra mework.bea ns.factory .annotatio n.Autowire d;
  8   import org .springfra mework.cor e.convert. converter. Converter;
  9   import org .springfra mework.ste reotype.Co mponent;
  10  
  11   import gov .va.genisi s2.dto.Req uestHistor yDTO;
  12   import gov .va.genisi s2.model.C ommentHist ory;
  13   import gov .va.genisi s2.model.R equest;
  14   import gov .va.genisi s2.model.R equestHist ory;
  15  
  16   /**
  17    * This cl ass is use d to conve rt Request HistoryDTO  to Reques tHistory e ntity and  vice-versa .
  18    * 
  19    * @author  P II
  20    *
  21    */
  22   @Component
  23   public cla ss Request HistoryCon verter imp lements Co nverter<Re questHisto ry, Reques tHistoryDT O> {
  24  
  25           @A utowired
  26           pr ivate Comm entHistory Converter  commentHis toryConver ter;
  27           
  28           /* *
  29            *  @param co mmentHisto ryConverte r the comm entHistory Converter  to set
  30            * /
  31           pu blic void  setComment HistoryCon verter(Com mentHistor yConverter  commentHi storyConve rter) {
  32                    this .commentHi storyConve rter = com mentHistor yConverter ;
  33           }
  34  
  35           @O verride
  36           pu blic Reque stHistoryD TO convert (RequestHi story requ estHistory ) {
  37                    Requ estHistory DTO reques tHistoryDt o = new Re questHisto ryDTO();
  38  
  39                    requ estHistory Dto.setHis tLineNo(re questHisto ry.getHist LineNo());
  40                    requ estHistory Dto.setReq uestId(req uestHistor y.getReque stId());
  41                    requ estHistory Dto.setPro cessId(req uestHistor y.getProce ssId());
  42                    requ estHistory Dto.setTit le(request History.ge tTitle());
  43                    requ estHistory Dto.setDes cription(r equestHist ory.getDes cription() );
  44                    requ estHistory Dto.setSta tusDescrip tion(reque stHistory. getStatusD escription ());
  45                    requ estHistory Dto.setReq uestTypeId (requestHi story.getR equestType Id());
  46                    
  47                    if ( requestHis tory.getDa taTypeId()  !=null)
  48                    requ estHistory .setDataTy peId(reque stHistory. getDataTyp eId());
  49                    
  50                    if(r equestHist ory.getSou rceId() !=  null)
  51                    requ estHistory Dto.setSou rceId(requ estHistory .getSource Id());
  52                    
  53                    requ estHistory Dto.setStu dyApproval Id(request History.ge tStudyAppr ovalId());
  54                    requ estHistory Dto.setCre atedOn(req uestHistor y.getCreat edOn());
  55                    requ estHistory Dto.setMod ifiedOn(re questHisto ry.getModi fiedOn());
  56                    requ estHistory Dto.setCre atedBy(req uestHistor y.getCreat edBy());
  57                    requ estHistory Dto.setMod ifiedBy(re questHisto ry.getModi fiedBy());
  58                    requ estHistory Dto.setApp roverId(re questHisto ry.getAppr overId());
  59                    requ estHistory Dto.setTas kId(reques tHistoryDt o.getTaskI d());
  60  
  61                    retu rn request HistoryDto ;
  62           }
  63  
  64           pu blic Reque stHistory  convert(Re questHisto ryDTO requ estHistory Dto) {
  65                    Requ estHistory  requestHi story = ne w RequestH istory();
  66  
  67                    requ estHistory .setHistLi neNo(reque stHistoryD to.getHist LineNo());
  68                    requ estHistory .setReques tId(reques tHistoryDt o.getReque stId());
  69                    requ estHistory .setProces sId(reques tHistoryDt o.getProce ssId());
  70                    requ estHistory .setTitle( requestHis toryDto.ge tTitle());
  71                    requ estHistory .setDescri ption(requ estHistory Dto.getDes cription() );
  72                    requ estHistory .setStatus Descriptio n(requestH istoryDto. getStatusD escription ());
  73                    requ estHistory .setSource Id(request HistoryDto .getSource Id());
  74                    requ estHistory .setReques tTypeId(re questHisto ryDto.getR equestType Id());
  75                    requ estHistory .setDataTy peId(reque stHistoryD to.getData TypeId());
  76                    requ estHistory .setStudyA pprovalId( requestHis toryDto.ge tStudyAppr ovalId());
  77                    requ estHistory .setCreate dOn(reques tHistoryDt o.getCreat edOn());
  78                    requ estHistory .setModifi edOn(reque stHistoryD to.getModi fiedOn());
  79                    requ estHistory .setCreate dBy(reques tHistoryDt o.getCreat edBy());
  80                    requ estHistory .setModifi edBy(reque stHistoryD to.getModi fiedBy());
  81                    requ estHistory .setApprov erId(reque stHistoryD to.getAppr overId());
  82                    requ estHistory .setTaskId (requestHi storyDto.g etTaskId() );
  83  
  84                    retu rn request History;
  85           }
  86  
  87           pu blic Set<R equestHist oryDTO> co nvertReque stHistorie s(Set<Requ estHistory > requestH istories)  {
  88                    Set< RequestHis toryDTO> r equestHist oryDtos =  null;
  89                    if ( !requestHi stories.is Empty()) {
  90                             reques tHistoryDt os = new H ashSet<>() ;
  91                             for (R equestHist ory reques tHistory :  requestHi stories) {
  92                                      requestH istoryDtos .add(conve rt(request History));
  93                             }
  94                    }
  95  
  96                    retu rn request HistoryDto s;
  97           }
  98           
  99           pu blic Reque stHistoryD TO convert (RequestHi story requ estHistory , List<Com mentHistor y> comment Histories)  {
  100                    Requ estHistory DTO reques tHistoryDt o = conver t(requestH istory);
  101                    
  102                    if ( null != co mmentHisto ries && !c ommentHist ories.isEm pty()) {
  103                             reques tHistoryDt o.setComme ntHistory( commentHis toryConver ter.conver tCommentHi stories(co mmentHisto ries));
  104                    }
  105                    
  106                    retu rn request HistoryDto ;
  107           }
  108  
  109           pu blic Reque stHistory  populateRe questHisto ry(Request  request)  {
  110                    Requ estHistory  requestHi story = ne w RequestH istory();
  111  
  112                    requ estHistory .setHistLi neNo(0);
  113                    requ estHistory .setReques tId(reques t.getId()) ;
  114                    requ estHistory .setReques t(request) ;
  115                    requ estHistory .setProces sId(reques t.getProce ssId());
  116                    requ estHistory .setTitle( request.ge tTitle());
  117                    requ estHistory .setDescri ption(requ est.getDes cription() );
  118                    requ estHistory .setStatus Descriptio n(request. getStatusD escription ());
  119                    requ estHistory .setReques tTypeId(re quest.getR equestType Id());
  120                    requ estHistory .setDataTy peId(reque st.getData TypeId());
  121                    requ estHistory .setSource Id(request .getSource Id());
  122                    requ estHistory .setStudyA pprovalId( request.ge tStudyAppr ovalId());
  123                    requ estHistory .setCreate dOn(reques t.getCreat edOn());
  124                    requ estHistory .setModifi edOn(reque st.getModi fiedOn());
  125                    requ estHistory .setCreate dBy(reques t.getCreat edBy());
  126                    requ estHistory .setModifi edBy(reque st.getModi fiedBy());
  127                    requ estHistory .setApprov erId(reque st.getAppr overId());
  128                    requ estHistory .setTaskId (request.g etTaskId() );
  129  
  130                    retu rn request History;
  131           }
  132   }

Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.