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

4268.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	ConsentComment.java	Fri Apr 21 20:03:30 2017 UTC

4268.2 Comparison summary

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

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

4268.4 Active regular expressions

No regular expressions were active.

4268.5 Comparison detail

				1		package go v.va.nvap. web.consen t.comment;
				2
				3		import jav a.io.Seria lizable;
				4		import jav a.util.Dat e;
				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.Lob;
				12		import jav ax.persist ence.Named Queries;
				13		import jav ax.persist ence.Named Query;
				14		import jav ax.persist ence.Seque nceGenerat or;
				15		import jav ax.persist ence.Table ;
				16		import jav ax.persist ence.Tempo ral;
				17		import jav ax.persist ence.Tempo ralType;
				18
				19		/**
				20		* @since 04/06/2016
				21		* @author Johann So nnenberg
				22		*/
				23		@Entity
				24		@Table(nam e = "CONSE NT_COMMENT ")
				25		@NamedQuer ies({
				26		@Named Query(name = "Consen tComment.f indAll", q uery = "SE LECT c FRO M ConsentC omment c") ,
				27		@Named Query(name = "Consen tComment.f indByComme ntId", que ry = "SELE CT c FROM ConsentCom ment c WHE RE c.comme ntId = :co mmentId"),
				28		@Named Query(name = "Consen tComment.f indByUserI d", query = "SELECT c FROM Con sentCommen t c WHERE c.userId = :userId") ,
				29		@Named Query(name = "Consen tComment.f indByDateA dded", que ry = "SELE CT c FROM ConsentCom ment c WHE RE c.dateA dded = :da teAdded"),
				30		@Named Query(name = "Consen tComment.f indByConse ntType", q uery = "SE LECT c FRO M ConsentC omment c W HERE c.con sentType = :consentT ype")})
				31		public cla ss Consent Comment im plements S erializabl e {
				32		privat e static f inal long serialVers ionUID = 1 L;
				33		@Id
				34		@Seque nceGenerat or(name = "consentCo mmentSeque nce", sequ enceName = "CONSENT_ COMMENT_SE Q", alloca tionSize = 1)
				35		@Gener atedValue( strategy = Generatio nType.SEQU ENCE, gene rator = "c onsentComm entSequenc e")
				36		@Basic (optional = false)
				37		@Colum n(name = " COMMENT_ID ")
				38		privat e Long com mentId;
				39		@Basic (optional = false)
				40		@Colum n(name = " USER_ID")
				41		privat e String u serId;
				42		@Basic (optional = false)
				43		@Colum n(name = " DATE_ADDED ")
				44		@Tempo ral(Tempor alType.TIM ESTAMP)
				45		privat e Date dat eAdded;
				46		@Basic (optional = false)
				47		@Lob
				48		@Colum n(name = " COMMENTS")
				49		privat e String c omments;
				50		@Colum n(name = " CONSENT_ID ")
				51		privat e Long con sentId;
				52		@Basic (optional = false)
				53		@Colum n(name = " CONSENT_TY PE")
				54		privat e String c onsentType ;
				55		@Colum n(name = " DELAYED_CO NSENT_ID")
				56		privat e Long del ayedConsen tId;
				57
				58		public ConsentCo mment() {
				59		}
				60
				61		public ConsentCo mment(Long commentId ) {
				62		th is.comment Id = comme ntId;
				63		}
				64
				65		public ConsentCo mment(Long commentId , String u serId, Dat e dateAdde d, String comments, Long conse ntId, Stri ng consent Type, Long delayedCo nsentId) {
				66		th is.comment Id = comme ntId;
				67		th is.userId = userId;
				68		th is.dateAdd ed = dateA dded;
				69		th is.comment s = commen ts;
				70		th is.consent Id = conse ntId;
				71		th is.consent Type = con sentType;
				72		th is.delayed ConsentId = delayedC onsentId;
				73		}
				74
				75		public Long getC ommentId() {
				76		re turn comme ntId;
				77		}
				78
				79		public void setC ommentId(L ong commen tId) {
				80		th is.comment Id = comme ntId;
				81		}
				82
				83		public String ge tUserId() {
				84		re turn userI d;
				85		}
				86
				87		public void setU serId(Stri ng userId) {
				88		th is.userId = userId;
				89		}
				90
				91		public Date getD ateAdded() {
				92		re turn dateA dded;
				93		}
				94
				95		public void setD ateAdded(D ate dateAd ded) {
				96		th is.dateAdd ed = dateA dded;
				97		}
				98
				99		public String ge tComments( ) {
				100		re turn comme nts.replac e("'", "'");
				101		}
				102
				103		public void setC omments(St ring comme nts) {
				104		th is.comment s = commen ts;
				105		}
				106
				107		public Long getC onsentId() {
				108		re turn conse ntId;
				109		}
				110
				111		public void setC onsentId(L ong consen tId) {
				112		th is.consent Id = conse ntId;
				113		}
				114
				115		public String ge tConsentTy pe() {
				116		re turn conse ntType;
				117		}
				118
				119		public void setC onsentType (String co nsentType) {
				120		th is.consent Type = con sentType;
				121		}
				122
				123		public Long getD elayedCons entId() {
				124		re turn delay edConsentI d;
				125		}
				126
				127		public void setD elayedCons entId(Long delayedCo nsentId) {
				128		th is.delayed ConsentId = delayedC onsentId;
				129		}
				130
				131		@Overr ide
				132		public int hashC ode() {
				133		in t hash = 0 ;
				134		ha sh += (com mentId != null ? com mentId.has hCode() : 0);
				135		re turn hash;
				136		}
				137
				138		@Overr ide
				139		public boolean e quals(Obje ct object) {
				140		// TODO: War ning - thi s method w on't work in the cas e the id f ields are not set
				141		if (!(object instanceo f ConsentC omment)) {
				142		return f alse;
				143		}
				144		Co nsentComme nt other = (ConsentC omment) ob ject;
				145		if ((this.co mmentId == null && o ther.comme ntId != nu ll) \|\| (th is.comment Id != null && !this. commentId. equals(oth er.comment Id))) {
				146		return f alse;
				147		}
				148		re turn true;
				149		}
				150
				151		@Overr ide
				152		public String to String() {
				153		re turn
				154		"comment Id=[" + co mmentId + "] " +
				155		"userId= [" + userI d + "] " +
				156		"dateAdd ed=[" + da teAdded.to String() + "] " +
				157		"comment s=[" + com ments + "] " +
				158		"consent Id=[" + co nsentId + "] " +
				159		"consent Type=[" + consentTyp e + "]";
				160		}
				161
				162		}