Produced by Araxis Merge on 3/1/2018 12:13:15 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.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | ehealth_xchange_cif.zip\NHIN_adapter\AdapterEJB\src\main\java\gov\va\med\nhin\adapter\patientdiscovery | CMProxyVAP.java | Thu Feb 22 14:26:26 2018 UTC |
| 2 | ehealth_xchange_cif.zip\NHIN_adapter\AdapterEJB\src\main\java\gov\va\med\nhin\adapter\patientdiscovery | CMProxyVAP.java | Tue Feb 27 14:24:34 2018 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 2 | 240 |
| Changed | 1 | 6 |
| Inserted | 0 | 0 |
| Removed | 0 | 0 |
| 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 |
No regular expressions were active.
| 1 | package go v.va.med.n hin.adapte r.patientd iscovery; | |
| 2 | ||
| 3 | import jav a.net.URL; | |
| 4 | ||
| 5 | import jav ax.ejb.EJB ; | |
| 6 | import jav ax.ejb.*; | |
| 7 | import jav ax.xml.nam espace.QNa me; | |
| 8 | ||
| 9 | import org .slf4j.Log ger; | |
| 10 | import org .slf4j.Log gerFactory ; | |
| 11 | ||
| 12 | import gov .va.med.nh in.adapter .propertyl ookup.Prop ertyLookup ; | |
| 13 | import gov .va.med.nh in.adapter .propertyl ookup.Prop ertyLookup Local; | |
| 14 | import gov .va.nvap.p rivacy.Con sentDirect iveAuthori zationRequ estType; | |
| 15 | import gov .va.nvap.p rivacy.Con sentDirect iveAuthori zationResp onseType; | |
| 16 | import gov .va.nvap.p rivacy.Con sentDirect iveQueryRe questType; | |
| 17 | import gov .va.nvap.p rivacy.Con sentDirect iveQueryRe sponseType ; | |
| 18 | import gov .va.nvap.p rivacy.Con sentDirect iveRevocat ionRequest Type; | |
| 19 | import gov .va.nvap.p rivacy.Con sentDirect iveRevocat ionRespons eType; | |
| 20 | import gov .va.nvap.p rivacy.Org anizationT rustedSour ceRequestT ype; | |
| 21 | import gov .va.nvap.p rivacy.Org anizationT rustedSour ceResponse Type; | |
| 22 | import pri vacy.servi ce.nvap. DNS .ConsentMa nagementPo rtType; | |
| 23 | import pri vacy.servi ce.nvap. DNS .ConsentMa nagementSe rvice; | |
| 24 | import pri vacy.servi ce.nvap. DNS .ConsentMa nagementSe rviceFault Message; | |
| 25 | ||
| 26 | /** | |
| 27 | * | |
| 28 | * @author Zack Pete rson | |
| 29 | */ | |
| 30 | @Transacti onAttribut e(value = Transactio nAttribute Type.SUPPO RTS) | |
| 31 | @Stateless (name = "C MProxyVAP" ) | |
| 32 | public cla ss CMProxy VAP implem ents CMPro xy | |
| 33 | { | |
| 34 | pr ivate stat ic final L ogger logg er = Logge rFactory.g etLogger(C MProxyVAP. class); | |
| 35 | ||
| 36 | pr ivate Cons entManagem entService consentMa nagementSe rvice; | |
| 37 | pr ivate Prop ertyLookup propertyL ookup; | |
| 38 | ||
| 39 | @E JB(beanInt erface = P ropertyLoo kupLocal.c lass, bean Name = "Pr opertyFile Lookup") | |
| 40 | pu blic void setPropert yLookup(Pr opertyLook up propert yLookup) | |
| 41 | { | |
| 42 | this .propertyL ookup = pr opertyLook up; | |
| 43 | } | |
| 44 | ||
| 45 | pr ivate Cons entManagem entPortTyp e getConse ntManageme ntPort() | |
| 46 | { | |
| 47 | if(c onsentMana gementServ ice == nul l) | |
| 48 | { | |
| 49 | try | |
| 50 | { | |
| 51 | consentM anagementS ervice = n ew Consent Management Service(ne w URL(prop ertyLookup .getProper ty("Consen tManagemen tServiceWS DL")), new QName("ht tp://gov.v a.nvap.ser vice.priva cy/", "Con sentManage mentServic e")); | |
| 52 | } | |
| 53 | catch( Throwable t) | |
| 54 | { | |
| 55 | throw ne w RuntimeE xception(" Unable to get Consen tManagemen tPort."); | |
| 56 | } | |
| 57 | } | |
| 58 | ||
| 59 | Cons entManagem entPortTyp e port = c onsentMana gementServ ice.getCon sentManage mentPort() ; | |
| 60 | retu rn port; | |
| 61 | } | |
| 62 | ||
| 63 | pu blic Conse ntDirectiv eAuthoriza tionRespon seType pro cessConsen tDirective Authorizat ion(Consen tDirective Authorizat ionRequest Type reque st) | |
| 64 | { | |
| 65 | try | |
| 66 | { | |
| 67 | return getConsen tManagemen tPort().pr ocessConse ntDirectiv eAuthoriza tion(reque st); | |
| 68 | } | |
| 69 | catc h(ConsentM anagementS erviceFaul tMessage e x) | |
| 70 | { | |
| 71 | // TOD O: Improve exception handling | |
| 72 | logger .error("er ror duing processCon sentDirect iveAuthori zation()", ex); | |
| 73 | } | |
| 74 | ||
| 75 | retu rn null; | |
| 76 | } | |
| 77 | ||
| 78 | pu blic Conse ntDirectiv eRevocatio nResponseT ype proces sConsentDi rectiveRev ocation(Co nsentDirec tiveRevoca tionReques tType requ est) | |
| 79 | { | |
| 80 | try | |
| 81 | { | |
| 82 | return getConsen tManagemen tPort().pr ocessConse ntDirectiv eRevocatio n(request) ; | |
| 83 | } | |
| 84 | catc h(ConsentM anagementS erviceFaul tMessage e x) | |
| 85 | { | |
| 86 | // TOD O: Improve exception handling | |
| 87 | logger .error("er ror duing processCon sentDirect iveRevocat ion()", ex ); | |
| 88 | } | |
| 89 | ||
| 90 | retu rn null; | |
| 91 | } | |
| 92 | ||
| 93 | pu blic Conse ntDirectiv eQueryResp onseType g etConsentD irectives( ConsentDir ectiveQuer yRequestTy pe request ) | |
| 94 | { | |
| 95 | try | |
| 96 | { | |
| 97 | return getConsen tManagemen tPort().ge tConsentDi rectives(r equest); | |
| 98 | } | |
| 99 | catc h(ConsentM anagementS erviceFaul tMessage e x) | |
| 100 | { | |
| 101 | // TOD O: Improve exception handling | |
| 102 | logger .error("er ror duing getConsent Directives ()", ex); | |
| 103 | ||
| 104 | } | |
| 105 | ||
| 106 | retu rn null; | |
| 107 | } | |
| 108 | ||
| 109 | public Organizat ionTrusted SourceResp onseType g etIsOrgani zationTrus tedSource( Organizati onTrustedS ourceReque stType req uest) { | |
| 110 | tr y | |
| 111 | { | |
| 112 | return g etConsentM anagementP ort().getI sOrganizat ionTrusted Source(req uest); | |
| 113 | } | |
| 114 | ca tch(Consen tManagemen tServiceFa ultMessage ex) | |
| 115 | { | |
| 116 | // TODO: Improve e xception h andling | |
| 117 | logger.e rror("erro r duing ge tIsOrganiz ationTrust edSource() ", ex); | |
| 118 | ||
| 119 | } | |
| 120 | ||
| 121 | re turn null; | |
| 122 | } | |
| 123 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.