Produced by Araxis Merge on 4/2/2019 1:06:54 PM Central 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 | C:\AraxisMergeCompare\Pri_un\ARS_Backend\ars_app\src\main\java\gov\va\med\ars\controller | RfaiUpdateSubmissionController.java | Wed Mar 27 19:21:11 2019 UTC |
2 | C:\AraxisMergeCompare\Pri_re\ARS_Backend\ars_app\src\main\java\gov\va\med\ars\controller | RfaiUpdateSubmissionController.java | Thu Mar 28 17:50:40 2019 UTC |
Description | Between Files 1 and 2 |
|
---|---|---|
Text Blocks | Lines | |
Unchanged | 2 | 154 |
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 | * | |
3 | */ | |
4 | package go v.va.med.a rs.control ler; | |
5 | ||
6 | import org .apache.lo gging.log4 j.LogManag er; | |
7 | import org .apache.lo gging.log4 j.Logger; | |
8 | import org .springfra mework.bea ns.factory .annotatio n.Autowire d; | |
9 | import org .springfra mework.htt p.HttpStat us; | |
10 | import org .springfra mework.htt p.Response Entity; | |
11 | import org .springfra mework.web .bind.anno tation.Pos tMapping; | |
12 | import org .springfra mework.web .bind.anno tation.Req uestBody; | |
13 | import org .springfra mework.web .bind.anno tation.Req uestMappin g; | |
14 | import org .springfra mework.web .bind.anno tation.Res tControlle r; | |
15 | ||
16 | import gov .va.med.ar s.constant s.ErrorMes sages; | |
17 | import gov .va.med.ar s.exceptio ns.Generic Exception; | |
18 | import gov .va.med.ar s.model.re quest.Upda teRfaiRequ est; | |
19 | import gov .va.med.ar s.service. IRfaiUpdat eSubmissio nService; | |
20 | import net .minidev.j son.JSONOb ject; | |
21 | ||
22 | /** | |
23 | * @author DN S DRAGOD | |
24 | * | |
25 | */ | |
26 | @RestContr oller | |
27 | @RequestMa pping("api /v1/update Rfai") | |
28 | public cla ss RfaiUpd ateSubmiss ionControl ler { | |
29 | ||
30 | pr ivate stat ic final L ogger logg er = LogMa nager.getL ogger(Rfai UpdateSubm issionCont roller.cla ss); | |
31 | ||
32 | @A utowired | |
33 | IR faiUpdateS ubmissionS ervice upd ateService ; | |
34 | ||
35 | /* * | |
36 | * @throws E xception | |
37 | * | |
38 | * / | |
39 | @P ostMapping (value = " /submitSim pleUpdate" ) | |
40 | pu blic Respo nseEntity< ?> postSub mitSimpleU pdate(@Req uestBody U pdateRfaiR equest upd ateRfaiReq uest) | |
41 | throws Exception { | |
42 | ||
43 | if ( updateRfai Request == null || u pdateRfaiR equest.get Submission Id() == nu ll | |
44 | || updat eRfaiReque st.getSubm issionStat us() == nu ll | |
45 | || updat eRfaiReque st.getSubm issionStat us().trim( ).isEmpty( ) | |
46 | || updat eRfaiReque st.getResp onseDate() == null | |
47 | || updat eRfaiReque st.getResp onseDate() .trim().is Empty()) { | |
48 | ||
49 | throw new Generi cException (ErrorMess ages.INVAL ID_REQUEST , "Invalid request", HttpStatu s.NOT_FOUN D); | |
50 | } | |
51 | ||
52 | try { | |
53 | ||
54 | boolea n updateRe sult = upd ateService .submitSim pleUpdate( updateRfai Request); | |
55 | ||
56 | if (up dateResult ) { | |
57 | ||
58 | JSONObje ct jsonRes ponse = ne w JSONObje ct(); | |
59 | jsonResp onse.put(" result", t rue); | |
60 | ||
61 | Response Entity<?> response = new Respo nseEntity< >(jsonResp onse, Http Status.OK) ; | |
62 | logger.i nfo( | |
63 | St ring.forma t("Success fully upda ted RFAI s ubmission %s", updat eRfaiReque st.getSubm issionId() )); | |
64 | ||
65 | return r esponse; | |
66 | ||
67 | } else { | |
68 | return n ew Respons eEntity<>( | |
69 | St ring.forma t("Error i n updating RFAI Subm ission %s" , updateRf aiRequest. getSubmiss ionId()), | |
70 | Ht tpStatus.B AD_REQUEST ); | |
71 | } | |
72 | ||
73 | } ca tch (Excep tion e) { | |
74 | logger .error("Up dateRfaiCo ntroller:p ostSubmitS impleUpdat e() except ion occure d " + e.ge tMessage() ); | |
75 | throw e; | |
76 | } | |
77 | } | |
78 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.