40. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 6/11/2019 10:54:09 AM 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.

40.1 Files compared

#	Location	File	Last Modified
1	HTRE_P3_v14.5_iter_4_build_14.zip\java\gov\va\med\ccht\persistent	SecurityDAO.java	Wed May 29 15:26:38 2019 UTC
2	HTRE_P3_v14.5_iter_4_build_14.zip\java\gov\va\med\ccht\persistent	SecurityDAO.java	Mon Jun 10 19:19:21 2019 UTC

40.2 Comparison summary

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

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

40.4 Active regular expressions

No regular expressions were active.

40.5 Comparison detail

	1	/******* ****** ****** ****** ****** ****** *******
	2	* Copyrig ht � 2010 VHA. All r ights rese rved
	3	******* ****** ****** ****** ****** ****** *******/
	4	package go v.va.med.c cht.persis tent;
	5
	6	import jav a.util.Lis t;
	7	import jav a.util.Map ;
	8
	9	import org .springfra mework.sec urity.core .userdetai ls.UserDet ailsServic e;
	10
	11	import gov .va.med.cc ht.model.S impleUser;
	12	import gov .va.med.cc ht.model.U ser;
	13	import gov .va.med.cc ht.model.U serRole;
	14	import gov .va.med.cc ht.model.t erminology .FederalHo liday;
	15	import gov .va.med.fw .model.Ent ityKey;
	16	import gov .va.med.fw .model.lda p.SearchCr iteria;
	17	import gov .va.med.fw .persisten t.DAOExcep tion;
	18	import gov .va.med.fw .security. Permission ;
	19	import gov .va.med.fw .security. Role;
	20	import gov .va.med.fw .security. SimpleRole ;
	21	import gov .va.med.fw .security. UserPrinci pal;
	22
	23	/**
	24	*
	25	*
	26	* IHTA IH TA_common Jun 24, 20 10
	27	*
	28	* @author DNS
	29	*/
	30	public int erface Sec urityDAO e xtends Use rDetailsSe rvice {
	31
	32	pu blic void persist(Ro le role);
	33	pu blic void remove(Rol e role);
	34	pu blic void persist(Us erRole use rRole);
	35	pu blic void remove(Use rRole user Role);
	36
	37	pu blic Objec t getByKey (EntityKey <?> entity Key);
	38
	39	Ma p<String, UserPrinci pal<?>> fi ndUsersWit hAnyRole(L ist<String > roles);
	40	/* *
	41	* Get user by name
	42	*
	43	* @param us erId
	44	* @return
	45	* /
	46	pu blic User getUserByN ame(String userId);
	47
	48	pu blic Role getRoleByI d(long id) ;
	49
	50	pu blic List< User> getS ubmittedRe gistration s(Integer visnId, In teger faci lityId);
	51
	52	/* *
	53	* Create us er in the IHTA datab ase
	54	*
	55	* @param us er
	56	* @throws D AOExceptio n
	57	* /
	58	pu blic void createUser (User user ) throws D AOExceptio n;
	59
	60	/* *
	61	* Update us er in the IHTA datab ase
	62	*
	63	* @param us er
	64	* @throws D AOExceptio n
	65	* /
	66	pu blic void updateUser (User user );
	67
	68	/* *
	69	* Update ro le in the IHTA datab ase
	70	*
	71	* @param us er
	72	* @throws D AOExceptio n
	73	* /
	74	pu blic void updateRole (Role role ) throws D AOExceptio n;
	75
	76	/* *
	77	* Find all roles
	78	*
	79	* @return
	80	* @throws D AOExceptio n
	81	* /
	82	pu blic List< Role> find AllRoles() throws DA OException ;
	83
	84	/* *
	85	* Find all permission s
	86	*
	87	* @return
	88	* @throws D AOExceptio n
	89	* /
	90	pu blic List< Permission > findAllP ermissions () throws DAOExcepti on;
	91
	92	/* *
	93	* Get Role by name
	94	*
	95	* @param ro leName
	96	* @return t he specifi ed Role, o r null if not found
	97	* /
	98	pu blic Role getRoleByN ame(String roleName) ;
	99	pu blic List< SimpleRole > findAllS impleRoles () throws DAOExcepti on;
	100	pu blic List< SimpleRole > findAllD MPRoles() throws DAO Exception;
	101	pu blic List< User> getS ubmittedRe gistration sForDmp(In teger visn Id, Intege r facility Id) throws DAOExcept ion;
	102	pu blic List< User> getN ewRegistra tions(Inte ger visnId , Integer facilityId );
	103	pu blic Simpl eRole getS impleRoleB yName(Stri ng roleNam e) throws DAOExcepti on;
	104
	105	/* *
	106	* Get avail able role names for assignment
	107	*
	108	* @return
	109	* @throws D AOExceptio n
	110	* /
	111	// pu blic List< String> ge tAvailable RoleNames( Applicatio n applicat ion) throw s DAOExcep tion;
	112
	113	/* *
	114	* Get assig ned permis sions for a given ro le
	115	*
	116	* @return
	117	* @throws D AOExceptio n
	118	* /
	119	pu blic List< String> ge tRolePermi ssionNames (String ro leName) th rows DAOEx ception;
	120
	121	pu blic void deleteRole (Role role );
	122	pu blic void deleteUser Role(UserR ole userRo le);
	123
	124	@S uppressWar nings("raw types")
	125	pu blic UserP rincipal g etAuditUse r(String u serName) t hrows DAOE xception;
	126	pu blic List< SimpleRole > getRoles ByUserName (String us erName);
	127
	128	pu blic List< FederalHol iday> find Holidays(i nt year) t hrows DAOE xception;
	129	pu blic List< String> ge tUserIds() throws DA OException ;
	130	pu blic List< SimpleUser > findAppU sers(Searc hCriteria searchCrit eria) thro ws DAOExce ption;
	131	pu blic List< User> getU sersByVisn (int visnI d);
	132	pu blic void deleteEnti ty(Object obj) throw s DAOExcep tion;
	133	pu blic void flush();
	134	pu blic void deleteRole Permission sFromRole( Role role) ;
	135
	136	}