321. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 12/5/2017 12:06:47 PM Central Standard 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.

321.1 Files compared

#	Location	File	Last Modified
1	IV-eHMP_CIF.zip\IMAG_Source\VISA\Java\MIXDataSource\main\src\java\gov\va\med\imaging\mix\rest\proxy	AbstractMixRestImageProxy.java	Mon Dec 4 21:35:20 2017 UTC
2	IV-eHMP_CIF.zip\IMAG_Source\VISA\Java\MIXDataSource\main\src\java\gov\va\med\imaging\mix\rest\proxy	AbstractMixRestImageProxy.java	Tue Dec 5 13:26:38 2017 UTC

321.2 Comparison summary

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

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

321.4 Active regular expressions

No regular expressions were active.

321.5 Comparison detail

	1	package go v.va.med.i maging.mix .rest.prox y;
	2
	3	import jav a.util.Map ;
	4
	5	import org .apache.lo gging.log4 j.LogManag er;
	6	import org .apache.lo gging.log4 j.Logger;
	7
	8	import gov .va.med.im aging.core .interface s.exceptio ns.Connect ionExcepti on;
	9	import gov .va.med.im aging.mix. proxy.Abst ractMixPro xy;
	10	import gov .va.med.im aging.mix. proxy.IMix Proxy;
	11	import gov .va.med.im aging.url. mix.config uration.MI XConfigura tion;
	12	import gov .va.med.im aging.url. mix.config uration.MI XSiteConfi guration;
	13	import gov .va.med.im aging.url. mix.except ions.MIXCo nfiguratio nException ;
	14	import gov .va.med.im aging.prox y.rest.Res tProxyComm on;
	15	// import gov.va.med .imaging.m ix.webserv ices.rest. endpoints. MixImageWA DORestUri;
	16	import gov .va.med.im aging.mix. webservice s.rest.end points.Mix RestUri;
	17	import gov .va.med.im aging.prox y.services .ProxyServ iceType;
	18	import gov .va.med.im aging.prox y.services .ProxyServ ices;
	19
	20	/**
	21	* @author vacotitto c
	22	*
	23	*/
	24	public abs tract clas s Abstract MixRestIma geProxy
	25	extends Ab stractMixP roxy
	26	implements IMixProxy
	27	{
	28	pr otected Lo gger getLo gger()
	29	{
	30	retu rn logger;
	31	}
	32
	33	pu blic Abstr actMixRest ImageProxy (ProxyServ ices proxy Services,
	34	MIXCon figuration mixConfig uration)
	35	{
	36	supe r(proxySer vices, mix Configurat ion);
	37	}
	38
	39	// pr otected ab stract Str ing getRes tServicePa th();
	40	// pr otected ab stract Pro xyServiceT ype getPro xyServiceT ype();
	41
	42	pr otected St ring getRe stServiceP ath()
	43	{
	44	retu rn MixRest Uri.mixRes tUriV1;
	45	}
	46	pr otected Pr oxyService Type getPr oxyService Type()
	47	{
	48	retu rn ProxySe rviceType. image;
	49	}
	50
	51	pu blic Strin g getWebRe sourceUrl( String met hodUri, Ma p<String, String> ur lParameter KeyValues) // was pr otected...
	52	th rows Conne ctionExcep tion
	53	{
	54	Stri ngBuilder url = new StringBuil der();
	55	//url.appe nd("https: //das-xxx. DNS : PORT /haims/");
	56	// url. append(pro xyServices .getProxyS ervice(get ProxyServi ceType()). getConnect ionURL()); // protoc ol://FQDN: port
	57	url. append(MIX Configurat ion.defaul tMIXProtoc ol + "://" );
	58	bool ean gotCon fig = fals e;
	59	try
	60	{
	61	if ((t his.mixCon figuration != null) &&
	62	(this.mi xConfigura tion.getSi teConfigur ation(MIXC onfigurati on.DEFAULT _DAS_SITE, MIXConfig uration.DE FAULT_DAS_ SITE) != n ull)) {
	63	MIXSiteC onfigurati on mixSite Config = t his.mixCon figuration .getSiteCo nfiguratio n(MIXConfi guration.D EFAULT_DAS _SITE, MIX Configurat ion.DEFAUL T_DAS_SITE );
	64	url.appe nd(mixSite Config.get Host() + " :" + mixSi teConfig.g etPort() + "/" + mix SiteConfig .getMixApp lication() + "/");
	65	gotConfi g=true;
	66	}
	67	} ca tch(MIXCon figuration Exception mce) {
	68	}
	69	if ( !gotConfig ) {
	70	getLog ger().debu g("MIXClie nt WARNING : Using ha rdcoded DO D Configur ation!!!") ;
	71	url.ap pend(MIXCo nfiguratio n.defaultD ODImageHos t + ":"+ M IXConfigur ation.defa ultDODImag ePort + "/ " + MIXCon figuration .defaultDO DXChangeAp plication) ;
	72	}
	73	url. append(get RestServic ePath());
	74	url. append("/" );
	75	url. append(Res tProxyComm on.replace MethodUriW ithValues( methodUri, urlParame terKeyValu es));
	76
	77	getL ogger().de bug("MIXCl ient WebRe sourceUrl: " + url.t oString()) ;
	78	retu rn url.toS tring();
	79	}
	80	}