4335. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 6/9/2017 3:51:29 PM Eastern 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.

4335.1 Files compared

#	Location	File	Last Modified
1			Fri Jun 9 19:51:29 2017 UTC
2	eHealth_Exch (eHealth Exchange Enhancements) Build 3 docs & code_May_2017.zip\VAP_CIF_CODE0502.zip\VAP_CIF_CODE0502\VAP_CIF_CODE0502\nvap-web\src\main\java\gov\va\nvap\web\user\role	UserRole.java	Fri Apr 21 20:15:58 2017 UTC

4335.2 Comparison summary

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

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

4335.4 Active regular expressions

No regular expressions were active.

4335.5 Comparison detail

				1		package go v.va.nvap. web.user.r ole;
				2
				3		import jav a.io.Seria lizable;
				4
				5		import jav ax.persist ence.Basic ;
				6		import jav ax.persist ence.Colum n;
				7		import jav ax.persist ence.Entit y;
				8		import jav ax.persist ence.Gener atedValue;
				9		import jav ax.persist ence.Gener ationType;
				10		import jav ax.persist ence.Id;
				11		import jav ax.persist ence.JoinC olumn;
				12		import jav ax.persist ence.ManyT oOne;
				13		import jav ax.persist ence.Named Queries;
				14		import jav ax.persist ence.Named Query;
				15		import jav ax.persist ence.Table ;
				16
				17		/**
				18		*
				19		* @author Zack Pete rson
				20		*/
				21		@Entity
				22		@Table(nam e = "USER_ ROLE")
				23		@NamedQuer ies({
				24		@Nam edQuery(na me = "User Role.findA ll", query = "SELECT r FROM Us erRole r") ,
				25		@Nam edQuery(na me = "User Role.findB yUserName" , query = "SELECT r FROM UserR ole r WHER E lower(r. userName) = :userNam e"),
				26		@Nam edQuery(na me = "User Role.findU serRoleNam es", query = "SELECT r.allowed Role.roleN ame FROM U serRole r WHERE lowe r(r.userNa me) = :use rName")})
				27		public cla ss UserRol e implemen ts Seriali zable {
				28		pr ivate stat ic final l ong serial VersionUID = 1L;
				29
				30		@I d
				31		@G eneratedVa lue(strate gy = Gener ationType. AUTO)
				32		@B asic(optio nal = fals e)
				33		@C olumn(name = "USER_R OLE_ID")
				34		pr ivate Long userRoleI d;
				35		@Basic (optional = false)
				36		@C olumn(name = "USER_N AME")
				37		pr ivate Stri ng userNam e;
				38		@JoinC olumn(name = "USER_R OLE", refe rencedColu mnName = " ROLE_ID")
				39		@ManyT oOne
				40		privat e AllowedR ole allowe dRole;
				41
				42		pu blic UserR ole() {
				43		}
				44
				45		public UserRole( final Stri ng userNam e) {
				46		this .userName = userName ;
				47		}
				48
				49		public UserRole( final Stri ng userNam e, final A llowedRole allowedRo le) {
				50		this .userName = userName ;
				51		th is.allowed Role = all owedRole;
				52		}
				53
				54		public String ge tUserName( ) {
				55		re turn userN ame;
				56		}
				57
				58		public void setU serName(St ring userN ame) {
				59		th is.userNam e = userNa me;
				60		}
				61
				62		public AllowedRo le getAllo wedRole() {
				63		re turn allow edRole;
				64		}
				65
				66		public void setA llowedRole (AllowedRo le allowed Role) {
				67		th is.allowed Role = all owedRole;
				68		}
				69
				70		public Long getU serRoleId( ) {
				71		re turn userR oleId;
				72		}
				73
				74		public void setU serRoleId( Long userR oleId) {
				75		th is.userRol eId = user RoleId;
				76		}
				77		}