Produced by Araxis Merge on 6/18/2018 3:37:04 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.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | CTT_DM2_v7.zip\VUID-rest\src\main\java\gov\vha\vuid\rest\session | PrismeServiceUtils.java | Tue Jun 12 16:41:56 2018 UTC |
| 2 | CTT_DM2_v7.zip\VUID-rest\src\main\java\gov\vha\vuid\rest\session | PrismeServiceUtils.java | Fri Jun 15 21:23:02 2018 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 2 | 132 |
| Changed | 1 | 2 |
| 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 | /** | |
| 2 | * Copyrig ht Notice | |
| 3 | * | |
| 4 | * This is a work of the U.S. Government and is no t subject to copyrig ht | |
| 5 | * protect ion in the United St ates. Fore ign copyri ghts may a pply. | |
| 6 | * | |
| 7 | * License d under th e Apache L icense, Ve rsion 2.0 (the "Lice nse"); | |
| 8 | * you may not use t his file e xcept in c ompliance with the L icense. | |
| 9 | * You may obtain a copy of th e License at | |
| 10 | * | |
| 11 | * http:// www.apache .org/licen ses/LICENS E-2.0 | |
| 12 | * | |
| 13 | * Unless required b y applicab le law or agreed to in writing , software | |
| 14 | * distrib uted under the Licen se is dist ributed on an "AS IS " BASIS, | |
| 15 | * WITHOUT WARRANTIE S OR CONDI TIONS OF A NY KIND, e ither expr ess or imp lied. | |
| 16 | * See the License f or the spe cific lang uage gover ning permi ssions and | |
| 17 | * limitat ions under the Licen se. | |
| 18 | */ | |
| 19 | ||
| 20 | package go v.vha.vuid .rest.sess ion; | |
| 21 | ||
| 22 | import org .apache.lo gging.log4 j.LogManag er; | |
| 23 | import org .apache.lo gging.log4 j.Logger; | |
| 24 | ||
| 25 | import jav a.util.Map ; | |
| 26 | ||
| 27 | import jav ax.ws.rs.c lient.WebT arget; | |
| 28 | ||
| 29 | import gov .vha.isaac .ochre.api .LookupSer vice; | |
| 30 | import gov .vha.isaac .rest.serv ices.Clien tService; | |
| 31 | import gov .vha.isaac .rest.util s.CommonPr ismeServic eUtils; | |
| 32 | import gov .vha.vuid. rest.Appli cationConf ig; | |
| 33 | ||
| 34 | /** | |
| 35 | * | |
| 36 | * {@link PrismeServ iceUtils} | |
| 37 | * | |
| 38 | * @author <a href=" mailto:joe l.kniaz.li st@gmail.c om">Joel K niaz</a> | |
| 39 | * | |
| 40 | */ | |
| 41 | public cla ss PrismeS erviceUtil s { | |
| 42 | @S uppressWar nings("unu sed") | |
| 43 | pr ivate stat ic Logger log = LogM anager.get Logger(Pri smeService Utils.clas s); | |
| 44 | ||
| 45 | pr ivate Pris meServiceU tils() {} | |
| 46 | ||
| 47 | pr otected st atic Strin g getConfi gProperty( String pro pertyName) | |
| 48 | { | |
| 49 | swit ch(propert yName) | |
| 50 | { | |
| 51 | //https:// DNS : PORT /rails_pri sme/roles/ get_roles_ by_token.j son | |
| 52 | case " prisme_rol es_by_toke n_url" : | |
| 53 | return A pplication Config.get Instance() .getProtoc ol() + ":/ /" + Appli cationConf ig.getInst ance().get Hostname() + ":" + A pplication Config.get Instance() .getPort() | |
| 54 | + "/rails_pr isme/roles /get_roles _by_token. json"; | |
| 55 | defaul t: | |
| 56 | throw ne w RuntimeE xception(" Unknown pr operty Nam e '" + pro pertyName + "'"); | |
| 57 | } | |
| 58 | } | |
| 59 | ||
| 60 | pu blic stati c String g etResultJs onFromPris me(String targetStr, String pa thStr, Map <String, S tring> par ams) { | |
| 61 | Clie ntService clientServ ice = Look upService. getService (ClientSer vice.class ); | |
| 62 | WebT arget targ et = clien tService.g etClient() .target(ta rgetStr); | |
| 63 | targ et = targe t.path(pat hStr); | |
| 64 | ||
| 65 | retu rn CommonP rismeServi ceUtils.ge tResultJso nFromPrism e(target, params); | |
| 66 | } | |
| 67 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.