Produced by Araxis Merge on 4/2/2019 1:06:55 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\service\impl | ArsEmailTemplateServiceImpl.java | Wed Mar 27 19:22:43 2019 UTC |
2 | C:\AraxisMergeCompare\Pri_re\ARS_Backend\ars_app\src\main\java\gov\va\med\ars\service\impl | ArsEmailTemplateServiceImpl.java | Thu Mar 28 17:50:50 2019 UTC |
Description | Between Files 1 and 2 |
|
---|---|---|
Text Blocks | Lines | |
Unchanged | 2 | 144 |
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 | package go v.va.med.a rs.service .impl; | |
2 | ||
3 | import jav a.text.Sim pleDateFor mat; | |
4 | import jav a.util.Arr ayList; | |
5 | import jav a.util.Dat e; | |
6 | import jav a.util.Lis t; | |
7 | ||
8 | import org .apache.lo gging.log4 j.LogManag er; | |
9 | import org .apache.lo gging.log4 j.Logger; | |
10 | import org .springfra mework.bea ns.factory .annotatio n.Autowire d; | |
11 | import org .springfra mework.ste reotype.Se rvice; | |
12 | ||
13 | import gov .va.med.ar s.dao.ars. EmailTempl ateReposit ory; | |
14 | import gov .va.med.ar s.exceptio ns.Generic Exception; | |
15 | import gov .va.med.ar s.model.re quest.Emai lTemplateR equest; | |
16 | import gov .va.med.ar s.service. IArsEmailT emplateSer vice; | |
17 | import gov .va.med.do main.ars.E mailTempla te; | |
18 | ||
19 | /** | |
20 | * @author Kawsar, H ayes | |
21 | * Changed the get c all to a l ist and fi xed the wa y it gets the respon ses | |
22 | * @author
|
|
23 | * | |
24 | */ | |
25 | @Service | |
26 | public cla ss ArsEmai lTemplateS erviceImpl implement s IArsEmai lTemplateS ervice { | |
27 | pr ivate stat ic final L ogger logg er = LogMa nager.getL ogger(ArsE mailTempla teServiceI mpl.class) ; | |
28 | ||
29 | @A utowired | |
30 | pr ivate Emai lTemplateR epository emailRepo; | |
31 | ||
32 | ||
33 | @O verride | |
34 | pu blic List< EmailTempl ateRequest > getEmail Template() throws Ge nericExcep tion { | |
35 | Emai lTemplateR equest tem plate = nu ll; | |
36 | List <EmailTemp lateReques t> templat eList = ne w ArrayLis t<>(); | |
37 | List <EmailTemp late> emai lTemplateL ist = null ; | |
38 | try { | |
39 | emailT emplateLis t = emailR epo.findAl l(); | |
40 | } ca tch (Excep tion e) { | |
41 | logger .error("Ar sEmailTemp lateServic eImpl.getE mailTempla teByType() : excepti on occured while ret rieving da ta."); | |
42 | } | |
43 | ||
44 | if(e mailTempla teList != null && em ailTemplat eList.size () > 0) { | |
45 | for(Em ailTemplat e emailTem plate: ema ilTemplate List) { | |
46 | template = new Ema ilTemplate Request(); | |
47 | template .setTempla teType(ema ilTemplate .getEmailT emplateTyp e()); | |
48 | template .setHeadin g(emailTem plate.getE mailTempla teHeader() ); | |
49 | template .setMessag e(emailTem plate.getE mailTempla teBody()); | |
50 | template .setTempla teName(ema ilTemplate .getEmailT emplateTyp e()); | |
51 | template .setModifi edBy(email Template.g etModified By()); | |
52 | template List.add(t emplate); | |
53 | } | |
54 | } | |
55 | retu rn templat eList; | |
56 | } | |
57 | ||
58 | @O verride | |
59 | pu blic boole an updateE mailTempla te(EmailTe mplateRequ est reques t) throws GenericExc eption { | |
60 | Date date = ne w Date(); | |
61 | Simp leDateForm at simpleD ateFormat = new Simp leDateForm at("MM/dd/ yyyy HH:mm :ss"); | |
62 | simp leDateForm at.format( date); | |
63 | Emai lTemplate emailTempl ate = emai lRepo.getE mailTempla teByType(r equest.get TemplateNa me()); | |
64 | Emai lTemplate templateTo Update = e mailRepo.f indOne(ema ilTemplate .getEmailT emplateId( )); | |
65 | temp lateToUpda te.setEmai lTemplateH eader(requ est.getHea ding()); | |
66 | temp lateToUpda te.setEmai lTemplateB ody(reques t.getMessa ge()); | |
67 | temp lateToUpda te.setDate Modified(d ate); | |
68 | temp lateToUpda te.setModi fiedBy(req uest.getMo difiedBy() ); | |
69 | Emai lTemplate updatedTem plate = em ailRepo.sa ve(templat eToUpdate) ; | |
70 | ||
71 | retu rn (update dTemplate != null) ? true : fa lse; | |
72 | } | |
73 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.