4269. EPMO Open Source Coordination Office Redaction File Detail Report

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

4269.1 Files compared

#	Location	File	Last Modified
1			Fri Jun 9 19:51:25 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\consent\comment	ConsentCommentDAO.java	Fri Apr 21 20:03:30 2017 UTC

4269.2 Comparison summary

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

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

4269.4 Active regular expressions

No regular expressions were active.

4269.5 Comparison detail

				1		package go v.va.nvap. web.consen t.comment;
				2
				3		import gov .va.nvap.c ommon.vali dation.Nul lChecker;
				4		import jav a.util.Arr ayList;
				5		import jav a.util.Lis t;
				6		import jav ax.persist ence.Entit yManager;
				7		import jav ax.persist ence.Persi stenceCont ext;
				8		import jav ax.persist ence.Query ;
				9		import org .springfra mework.tra nsaction.a nnotation. Transactio nal;
				10
				11		/**
				12		*
				13		* @author Johann So nnenberg
				14		*/
				15		public cla ss Consent CommentDAO {
				16
				17		/**
				18		* Ent ity Manage r instance .
				19		*/
				20		@Persi stenceCont ext
				21		privat e EntityMa nager em;
				22
				23		@Trans actional
				24		public ConsentCo mment crea te(Consent Comment co mment) {
				25		em .persist(c omment);
				26		re turn comme nt;
				27		}
				28
				29		public List<Cons entComment > getComme ntsByConse ntIds(List <Long> con sentIds) {
				30		if (NullChec ker.isNull OrEmpty(co nsentIds)) {
				31		return n ew ArrayLi st<Consent Comment>() ;
				32		} else {
				33		Query qu ery = em.c reateQuery ("SELECT c FROM Cons entComment c WHERE c .consentId IN (:cons entIds) OR DER BY c.d ateAdded D ESC");
				34		query.se tParameter ("consentI ds", conse ntIds);
				35
				36		return ( List<Conse ntComment> ) query.ge tResultLis t();
				37		}
				38		}
				39
				40		public List<Cons entComment > getComme ntsByDelay edConsentI ds(List<Lo ng> delaye dConsentId s) {
				41		if (NullChec ker.isNull OrEmpty(de layedConse ntIds)) {
				42		return n ew ArrayLi st<Consent Comment>() ;
				43		} else {
				44		Query qu ery = em.c reateQuery ("SELECT c FROM Cons entComment c WHERE c .delayedCo nsentId IN (:delayed ConsentIds ) ORDER BY c.dateAdd ed DESC");
				45		query.se tParameter ("delayedC onsentIds" , delayedC onsentIds) ;
				46
				47		return ( List<Conse ntComment> ) query.ge tResultLis t();
				48		}
				49		}
				50
				51		/**
				52		* Set the entit y manager (Injected by Spring) .
				53		*
				54		* @pa ram em Ent ityManager instance
				55		*/
				56		public void setE ntityManag er(final E ntityManag er em) {
				57		th is.em = em ;
				58		}
				59
				60		}