4149. EPMO Open Source Coordination Office Redaction File Detail Report

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

4149.1 Files compared

#	Location	File	Last Modified
1			Fri Jun 9 19:51:18 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-svc-consent-mgmt\src\main\java\gov\va\nvap\svc\consentmgmt\stub\data	ConsentType.java	Fri Apr 21 20:03:30 2017 UTC

4149.2 Comparison summary

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

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

4149.4 Active regular expressions

No regular expressions were active.

4149.5 Comparison detail

				1		/*
				2		* To chan ge this te mplate, ch oose Tools \| Templat es
				3		* and ope n the temp late in th e editor.
				4		*/
				5		package go v.va.nvap. svc.consen tmgmt.stub .data;
				6
				7		import jav a.io.Seria lizable;
				8		import jav a.util.Col lection;
				9		import jav ax.persist ence.Basic ;
				10		import jav ax.persist ence.Casca deType;
				11		import jav ax.persist ence.Colum n;
				12		import jav ax.persist ence.Entit y;
				13		import jav ax.persist ence.Gener atedValue;
				14		import jav ax.persist ence.Gener ationType;
				15		import jav ax.persist ence.Id;
				16		import jav ax.persist ence.Named Queries;
				17		import jav ax.persist ence.Named Query;
				18		import jav ax.persist ence.OneTo Many;
				19		import jav ax.persist ence.Table ;
				20
				21		/**
				22		*
				23		* @author vhaislegb erb
				24		*/
				25		@Entity
				26		@Table(nam e = "CONSE NT_TYPE")
				27		@NamedQuer ies({
				28		@Nam edQuery(na me = "Cons entType.fi ndAll", qu ery = "SEL ECT c FROM ConsentTy pe c"),
				29		@Nam edQuery(na me = "Cons entType.fi ndByConsen tTypeId", query = "S ELECT c FR OM Consent Type c WHE RE c.conse ntTypeId = :consentT ypeId"),
				30		@Nam edQuery(na me = "Cons entType.fi ndByName", query = " SELECT c F ROM Consen tType c WH ERE c.name = :name") })
				31		public cla ss Consent Type imple ments Seri alizable {
				32
				33		@OneTo Many(casca de = Casca deType.ALL , mappedBy = "consen tTypeId")
				34		privat e Collecti on<Delayed Consent> d elayedCons entCollect ion;
				35		pr ivate stat ic final l ong serial VersionUID = 1L;
				36		@I d
				37		@G eneratedVa lue(strate gy = Gener ationType. AUTO)
				38		@B asic(optio nal = fals e)
				39		@C olumn(name = "CONSEN T_TYPE_ID" )
				40		pr ivate Long consentTy peId;
				41		@B asic(optio nal = fals e)
				42		@C olumn(name = "NAME")
				43		pr ivate Stri ng name;
				44
				45		pu blic Conse ntType() {
				46		}
				47
				48		pu blic Conse ntType(fin al Long co nsentTypeI d) {
				49		this .consentTy peId = con sentTypeId ;
				50		}
				51
				52		pu blic Conse ntType(fin al Long co nsentTypeI d, final S tring name ) {
				53		this .consentTy peId = con sentTypeId ;
				54		this .name = na me;
				55		}
				56
				57		@O verride
				58		pu blic boole an equals( final Obje ct object) {
				59		// T ODO: Warni ng - this method won 't work in the case the id fie lds are
				60		// n ot set
				61		if ( !(object i nstanceof ConsentTyp e)) {
				62		return false;
				63		}
				64		fina l ConsentT ype other = (Consent Type) obje ct;
				65		if ( ((this.con sentTypeId == null) && (other. consentTyp eId != nul l))
				66		\|\| ((thi s.consentT ypeId != n ull) && !t his.consen tTypeId
				67		.e quals(othe r.consentT ypeId))) {
				68		return false;
				69		}
				70		retu rn true;
				71		}
				72
				73		pu blic Long getConsent TypeId() {
				74		retu rn this.co nsentTypeI d;
				75		}
				76
				77		pu blic Strin g getName( ) {
				78		retu rn this.na me;
				79		}
				80
				81		@O verride
				82		pu blic int h ashCode() {
				83		int hash = 0;
				84		hash += (this. consentTyp eId != nul l ? this.c onsentType Id.hashCod e() : 0);
				85		retu rn hash;
				86		}
				87
				88		pu blic void setConsent TypeId(fin al Long co nsentTypeI d) {
				89		this .consentTy peId = con sentTypeId ;
				90		}
				91
				92		pu blic void setName(fi nal String name) {
				93		this .name = na me;
				94		}
				95
				96		@O verride
				97		pu blic Strin g toString () {
				98		retu rn "gov.va .nvap.svc. consentmgm t.ConsentT ype[ conse ntTypeId="
				99		+ this.c onsentType Id + " ]";
				100		}
				101
				102		public Collectio n<DelayedC onsent> ge tDelayedCo nsentColle ction() {
				103		re turn delay edConsentC ollection;
				104		}
				105
				106		public void setD elayedCons entCollect ion(Collec tion<Delay edConsent> delayedCo nsentColle ction) {
				107		th is.delayed ConsentCol lection = delayedCon sentCollec tion;
				108		}
				109
				110		}