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

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

4146.2 Comparison summary

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

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

4146.4 Active regular expressions

No regular expressions were active.

4146.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
				6		package go v.va.nvap. svc.consen tmgmt.stub .data;
				7
				8		import jav a.io.Seria lizable;
				9
				10		import jav ax.persist ence.Basic ;
				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.Table ;
				19
				20		/**
				21		*
				22		* @author vhaislegb erb
				23		*/
				24		@Entity
				25		@Table(nam e = "AUTHO RITY")
				26		@NamedQuer ies({
				27		@Nam edQuery(na me = "Auth ority.find All", quer y = "SELEC T a FROM A uthority a "),
				28		@Nam edQuery(na me = "Auth ority.find ByAuthorit yId", quer y = "SELEC T a FROM A uthority a WHERE a.a uthorityId = :author ityId"),
				29		@Nam edQuery(na me = "Auth ority.find ByOid", qu ery = "SEL ECT a FROM Authority a WHERE a .oid = :oi d"),
				30		@Nam edQuery(na me = "Auth ority.find ByAuthorit yName", qu ery = "SEL ECT a FROM Authority a WHERE a .authority Name = :au thorityNam e") })
				31		public cla ss Authori ty impleme nts Serial izable {
				32		pr ivate stat ic final l ong serial VersionUID = 1L;
				33		@I d
				34		@G eneratedVa lue(strate gy = Gener ationType. AUTO)
				35		@B asic(optio nal = fals e)
				36		@C olumn(name = "AUTHOR ITY_ID")
				37		pr ivate Long authority Id;
				38		@C olumn(name = "AUTHOR ITY_NAME")
				39		pr ivate Stri ng authori tyName;
				40		@C olumn(name = "OID")
				41		pr ivate Stri ng oid;
				42
				43		pu blic Autho rity() {
				44		}
				45
				46		pu blic Autho rity(final Long auth orityId) {
				47		this .authority Id = autho rityId;
				48		}
				49
				50		@O verride
				51		pu blic boole an equals( final Obje ct object) {
				52		// T ODO: Warni ng - this method won 't work in the case the id fie lds are
				53		// n ot set
				54		if ( !(object i nstanceof Authority) ) {
				55		return false;
				56		}
				57		fina l Authorit y other = (Authority ) object;
				58		if ( ((this.aut horityId = = null) && (other.au thorityId != null))
				59		\|\| ((thi s.authorit yId != nul l) && !thi s.authorit yId
				60		.e quals(othe r.authorit yId))) {
				61		return false;
				62		}
				63		retu rn true;
				64		}
				65
				66		pu blic Long getAuthori tyId() {
				67		retu rn this.au thorityId;
				68		}
				69
				70		pu blic Strin g getAutho rityName() {
				71		retu rn this.au thorityNam e;
				72		}
				73
				74		pu blic Strin g getOid() {
				75		retu rn this.oi d;
				76		}
				77
				78		@O verride
				79		pu blic int h ashCode() {
				80		int hash = 0;
				81		hash += (this. authorityI d != null ? this.aut horityId.h ashCode() : 0);
				82		retu rn hash;
				83		}
				84
				85		pu blic void setAuthori tyId(final Long auth orityId) {
				86		this .authority Id = autho rityId;
				87		}
				88
				89		pu blic void setAuthori tyName(fin al String authorityN ame) {
				90		this .authority Name = aut horityName ;
				91		}
				92
				93		pu blic void setOid(fin al String oid) {
				94		this .oid = oid ;
				95		}
				96
				97		@O verride
				98		pu blic Strin g toString () {
				99		retu rn "gov.va .nvap.svc. consentmgm t.entities .Authority [authority Id="
				100		+ this.a uthorityId + "]";
				101		}
				102
				103		}