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

107.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 UserRoleTypeConverter.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 UserRoleTypeConverter.java Wed Dec 20 22:10:52 2017 UTC

107.2 Comparison summary

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

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

107.4 Active regular expressions

No regular expressions were active.

107.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.Set ;
  5  
  6   import org .springfra mework.bea ns.factory .annotatio n.Autowire d;
  7   import org .springfra mework.cor e.convert. converter. Converter;
  8   import org .springfra mework.ste reotype.Co mponent;
  9  
  10   import gov .va.genisi s2.dto.Use rRoleTypeD TO;
  11   import gov .va.genisi s2.model.R oleType;
  12   import gov .va.genisi s2.model.U ser;
  13   import gov .va.genisi s2.model.U serRoleTyp e;
  14   import gov .va.genisi s2.model.U serType;
  15   import gov .va.genisi s2.util.Da teUtil;
  16  
  17   /**
  18    * This cl ass is use d to conve rt UserRol eTypeDTO t o UserRole Type entit y and
  19    * vice-ve rsa.
  20    * 
  21    * @author  P II
  22    * @author   PII
  23    *
  24    */
  25   @Component
  26   public cla ss UserRol eTypeConve rter imple ments Conv erter<User RoleType,  UserRoleTy peDTO> {
  27  
  28           @A utowired
  29           pr ivate Role TypeConver ter roleTy peConverte r;
  30  
  31           @A utowired
  32           pr ivate User TypeConver ter userTy peConverte r;
  33  
  34           @O verride
  35           pu blic UserR oleTypeDTO  convert(U serRoleTyp e userRole Type) {
  36                    User RoleTypeDT O userRole TypeDto =  new UserRo leTypeDTO( );
  37  
  38                    user RoleTypeDt o.setId(us erRoleType .getId());
  39                    user RoleTypeDt o.setStart Date(userR oleType.ge tStartDate ());
  40                    user RoleTypeDt o.setEndDa te(userRol eType.getE ndDate());
  41                    user RoleTypeDt o.setRoleT ypeId(user RoleType.g etRoleType Id());
  42  
  43                    Role Type roleT ype = user RoleType.g etRoleType ();
  44                    if ( null != ro leType) {
  45                             userRo leTypeDto. setRoleTyp e(roleType Converter. convert(ro leType));
  46                    }
  47  
  48                    user RoleTypeDt o.setUserT ypeId(user RoleType.g etUserType Id());
  49  
  50                    User Type userT ype = user RoleType.g etUserType ();
  51                    if ( null != us erType) {
  52                             userRo leTypeDto. setUserTyp e(userType Converter. convert(us erType));
  53                    }
  54  
  55                    user RoleTypeDt o.setUserI d(userRole Type.getUs erId());
  56  
  57                    retu rn userRol eTypeDto;
  58           }
  59  
  60           pu blic Set<U serRoleTyp eDTO> conv ertUserRol eTypes(Set <UserRoleT ype> userR oleTypes)  {
  61                    Set< UserRoleTy peDTO> use rRoleTypes Dtos = nul l;
  62                    if ( !userRoleT ypes.isEmp ty()) {
  63                             userRo leTypesDto s = new Ha shSet<>();
  64                             for (U serRoleTyp e userRole Type : use rRoleTypes ) {
  65                                      userRole TypesDtos. add(conver t(userRole Type));
  66                             }
  67                    }
  68  
  69                    retu rn userRol eTypesDtos ;
  70           }
  71           
  72           pu blic UserR oleType po pulate(Use rRoleType  userRoleTy pe, User u ser, UserT ype userTy pe, RoleTy pe roleTyp e) {
  73                    User RoleType u srRoleType  = new Use rRoleType( );
  74  
  75                    if ( null != us erRoleType  && userRo leType.get Id() > 0)  {
  76                             usrRol eType.setI d(userRole Type.getId ());
  77                    }
  78                    usrR oleType.se tUser(user );
  79                    usrR oleType.se tUserType( userType);
  80                    usrR oleType.se tRoleType( roleType);
  81                    usrR oleType.se tStartDate (DateUtil. getTodaysD ate());
  82                    
  83                    retu rn usrRole Type;
  84           }
  85  
  86           /* *
  87            *  @param ro leTypeConv erter
  88            *              the role TypeConver ter to set
  89            * /
  90           pu blic void  setRoleTyp eConverter (RoleTypeC onverter r oleTypeCon verter) {
  91                    this .roleTypeC onverter =  roleTypeC onverter;
  92           }
  93  
  94           /* *
  95            *  @param us erTypeConv erter
  96            *              the user TypeConver ter to set
  97            * /
  98           pu blic void  setUserTyp eConverter (UserTypeC onverter u serTypeCon verter) {
  99                    this .userTypeC onverter =  userTypeC onverter;
  100           }
  101  
  102   }