Produced by Araxis Merge on 12/20/2017 5:56:12 PM Eastern 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 | Genisis_2.0_v6_bld6.zip\Source Code\UI\Services\src\main\java\gov\va\genisis2\dto | RequestDTO.java | Thu Dec 14 19:57:09 2017 UTC |
| 2 | Genisis_2.0_v6_bld6.zip\Source Code\UI\Services\src\main\java\gov\va\genisis2\dto | RequestDTO.java | Wed Dec 20 22:15:14 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 2 | 744 |
| 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.genis is2.dto; | |
| 2 | ||
| 3 | import jav a.io.Seria lizable; | |
| 4 | import jav a.util.Dat e; | |
| 5 | import jav a.util.Set ; | |
| 6 | ||
| 7 | import jav ax.xml.bin d.annotati on.XmlRoot Element; | |
| 8 | ||
| 9 | import com .fasterxml .jackson.a nnotation. JsonIgnore ; | |
| 10 | import com .fasterxml .jackson.a nnotation. JsonIgnore Properties ; | |
| 11 | import com .fasterxml .jackson.a nnotation. JsonInclud e; | |
| 12 | import com .fasterxml .jackson.a nnotation. JsonInclud e.Include; | |
| 13 | ||
| 14 | /** | |
| 15 | * Data Tr ansfer Obj ect (DTO) to transfe r request related de tails | |
| 16 | * | |
| 17 | * @author P II | |
| 18 | * | |
| 19 | */ | |
| 20 | @XmlRootEl ement(name = "reques t") | |
| 21 | @JsonInclu de(Include .NON_NULL) | |
| 22 | @JsonIgnor ePropertie s({ "proce ssId", "ta skId", "re questType" , "dataTyp e","studyA pproval", "source", "requestHi stories" } ) | |
| 23 | public cla ss Request DTO implem ents Seria lizable { | |
| 24 | ||
| 25 | pr ivate stat ic final l ong serial VersionUID = -549334 2099044590 909L; | |
| 26 | ||
| 27 | pr ivate int id; | |
| 28 | @J sonIgnore | |
| 29 | pr ivate int processId; | |
| 30 | pr ivate Stri ng title; | |
| 31 | pr ivate Stri ng descrip tion; | |
| 32 | pr ivate Stri ng statusD escription ; | |
| 33 | pr ivate Date createdOn ; | |
| 34 | pr ivate Date modifiedO n; | |
| 35 | pr ivate Stri ng created By; | |
| 36 | pr ivate Stri ng modifie dBy; | |
| 37 | pr ivate Stri ng approve rId; | |
| 38 | @J sonIgnore | |
| 39 | pr ivate Stri ng taskId; | |
| 40 | pr ivate Stri ng comment s; | |
| 41 | @J sonIgnore | |
| 42 | pr ivate Set< RequestHis toryDTO> r equestHist ories; | |
| 43 | pr ivate int requestTyp eId; | |
| 44 | @J sonIgnore | |
| 45 | pr ivate Requ estTypeDTO requestTy pe; | |
| 46 | ||
| 47 | pr ivate int dataTypeId ; | |
| 48 | @J sonIgnore | |
| 49 | pr ivate Data TypeDTO da taType; | |
| 50 | ||
| 51 | pr ivate int studyAppro valId; | |
| 52 | @J sonIgnore | |
| 53 | pr ivate Stud yApprovalD TO studyAp proval; | |
| 54 | pr ivate int sourceId; | |
| 55 | @J sonIgnore | |
| 56 | pr ivate Sour ceDTO sour ce; | |
| 57 | ||
| 58 | /* * | |
| 59 | * @return t he id | |
| 60 | * / | |
| 61 | pu blic int g etId() { | |
| 62 | retu rn id; | |
| 63 | } | |
| 64 | ||
| 65 | /* * | |
| 66 | * @param id | |
| 67 | * the id t o set | |
| 68 | * / | |
| 69 | pu blic void setId(int id) { | |
| 70 | this .id = id; | |
| 71 | } | |
| 72 | ||
| 73 | /* * | |
| 74 | * @return t he process Id | |
| 75 | * / | |
| 76 | pu blic int g etProcessI d() { | |
| 77 | retu rn process Id; | |
| 78 | } | |
| 79 | ||
| 80 | /* * | |
| 81 | * @param pr ocessId | |
| 82 | * the proc essId to s et | |
| 83 | * / | |
| 84 | pu blic void setProcess Id(int pro cessId) { | |
| 85 | this .processId = process Id; | |
| 86 | } | |
| 87 | ||
| 88 | /* * | |
| 89 | * @return t he title | |
| 90 | * / | |
| 91 | pu blic Strin g getTitle () { | |
| 92 | retu rn title; | |
| 93 | } | |
| 94 | ||
| 95 | /* * | |
| 96 | * @param ti tle | |
| 97 | * the titl e to set | |
| 98 | * / | |
| 99 | pu blic void setTitle(S tring titl e) { | |
| 100 | this .title = t itle; | |
| 101 | } | |
| 102 | ||
| 103 | /* * | |
| 104 | * @return t he descrip tion | |
| 105 | * / | |
| 106 | pu blic Strin g getDescr iption() { | |
| 107 | retu rn descrip tion; | |
| 108 | } | |
| 109 | ||
| 110 | /* * | |
| 111 | * @param de scription | |
| 112 | * the desc ription to set | |
| 113 | * / | |
| 114 | pu blic void setDescrip tion(Strin g descript ion) { | |
| 115 | this .descripti on = descr iption; | |
| 116 | } | |
| 117 | ||
| 118 | /* * | |
| 119 | * @return t he statusD escription | |
| 120 | * / | |
| 121 | pu blic Strin g getStatu sDescripti on() { | |
| 122 | retu rn statusD escription ; | |
| 123 | } | |
| 124 | ||
| 125 | /* * | |
| 126 | * @param st atusDescri ption | |
| 127 | * the stat usDescript ion to set | |
| 128 | * / | |
| 129 | pu blic void setStatusD escription (String st atusDescri ption) { | |
| 130 | this .statusDes cription = statusDes cription; | |
| 131 | } | |
| 132 | ||
| 133 | /* * | |
| 134 | * @return t he created On | |
| 135 | * / | |
| 136 | pu blic Date getCreated On() { | |
| 137 | retu rn created On; | |
| 138 | } | |
| 139 | ||
| 140 | /* * | |
| 141 | * @param cr eatedOn | |
| 142 | * the crea tedOn to s et | |
| 143 | * / | |
| 144 | pu blic void setCreated On(Date cr eatedOn) { | |
| 145 | this .createdOn = created On; | |
| 146 | } | |
| 147 | ||
| 148 | /* * | |
| 149 | * @return t he modifie dOn | |
| 150 | * / | |
| 151 | pu blic Date getModifie dOn() { | |
| 152 | retu rn modifie dOn; | |
| 153 | } | |
| 154 | ||
| 155 | /* * | |
| 156 | * @param mo difiedOn | |
| 157 | * the modi fiedOn to set | |
| 158 | * / | |
| 159 | pu blic void setModifie dOn(Date m odifiedOn) { | |
| 160 | this .modifiedO n = modifi edOn; | |
| 161 | } | |
| 162 | ||
| 163 | /* * | |
| 164 | * @return t he created By | |
| 165 | * / | |
| 166 | pu blic Strin g getCreat edBy() { | |
| 167 | retu rn created By; | |
| 168 | } | |
| 169 | ||
| 170 | /* * | |
| 171 | * @param cr eatedBy | |
| 172 | * the crea tedBy to s et | |
| 173 | * / | |
| 174 | pu blic void setCreated By(String createdBy) { | |
| 175 | this .createdBy = created By; | |
| 176 | } | |
| 177 | ||
| 178 | /* * | |
| 179 | * @return t he modifie dBy | |
| 180 | * / | |
| 181 | pu blic Strin g getModif iedBy() { | |
| 182 | retu rn modifie dBy; | |
| 183 | } | |
| 184 | ||
| 185 | /* * | |
| 186 | * @param mo difiedBy | |
| 187 | * the modi fiedBy to set | |
| 188 | * / | |
| 189 | pu blic void setModifie dBy(String modifiedB y) { | |
| 190 | this .modifiedB y = modifi edBy; | |
| 191 | } | |
| 192 | ||
| 193 | /* * | |
| 194 | * @return t he approve rId | |
| 195 | * / | |
| 196 | pu blic Strin g getAppro verId() { | |
| 197 | retu rn approve rId; | |
| 198 | } | |
| 199 | ||
| 200 | /* * | |
| 201 | * @param ap proverId | |
| 202 | * the appr overId to set | |
| 203 | * / | |
| 204 | pu blic void setApprove rId(String approverI d) { | |
| 205 | this .approverI d = approv erId; | |
| 206 | } | |
| 207 | ||
| 208 | /* * | |
| 209 | * @return t he taskId | |
| 210 | * / | |
| 211 | pu blic Strin g getTaskI d() { | |
| 212 | retu rn taskId; | |
| 213 | } | |
| 214 | ||
| 215 | /* * | |
| 216 | * @param ta skId | |
| 217 | * the task Id to set | |
| 218 | * / | |
| 219 | pu blic void setTaskId( String tas kId) { | |
| 220 | this .taskId = taskId; | |
| 221 | } | |
| 222 | ||
| 223 | /* * | |
| 224 | * @return t he comment s | |
| 225 | * / | |
| 226 | pu blic Strin g getComme nts() { | |
| 227 | retu rn comment s; | |
| 228 | } | |
| 229 | ||
| 230 | /* * | |
| 231 | * @param co mments | |
| 232 | * the comm ents to se t | |
| 233 | * / | |
| 234 | pu blic void setComment s(String c omments) { | |
| 235 | this .comments = comments ; | |
| 236 | } | |
| 237 | ||
| 238 | /* * | |
| 239 | * @return t he request Histories | |
| 240 | * / | |
| 241 | pu blic Set<R equestHist oryDTO> ge tRequestHi stories() { | |
| 242 | retu rn request Histories; | |
| 243 | } | |
| 244 | ||
| 245 | /* * | |
| 246 | * @param re questHisto ries | |
| 247 | * the requ estHistori es to set | |
| 248 | * / | |
| 249 | pu blic void setRequest Histories( Set<Reques tHistoryDT O> request Histories) { | |
| 250 | this .requestHi stories = requestHis tories; | |
| 251 | } | |
| 252 | ||
| 253 | /* * | |
| 254 | * @return t he request TypeId | |
| 255 | * / | |
| 256 | pu blic int g etRequestT ypeId() { | |
| 257 | retu rn request TypeId; | |
| 258 | } | |
| 259 | ||
| 260 | /* * | |
| 261 | * @param re questTypeI d | |
| 262 | * the requ estTypeId to set | |
| 263 | * / | |
| 264 | pu blic void setRequest TypeId(int requestTy peId) { | |
| 265 | this .requestTy peId = req uestTypeId ; | |
| 266 | } | |
| 267 | ||
| 268 | /* * | |
| 269 | * @return t he request Type | |
| 270 | * / | |
| 271 | pu blic Reque stTypeDTO getRequest Type() { | |
| 272 | retu rn request Type; | |
| 273 | } | |
| 274 | ||
| 275 | /* * | |
| 276 | * @param re questType | |
| 277 | * the requ estType to set | |
| 278 | * / | |
| 279 | pu blic void setRequest Type(Reque stTypeDTO requestTyp e) { | |
| 280 | this .requestTy pe = reque stType; | |
| 281 | } | |
| 282 | ||
| 283 | /* * | |
| 284 | * @return t he studyAp provalId | |
| 285 | * / | |
| 286 | pu blic int g etStudyApp rovalId() { | |
| 287 | retu rn studyAp provalId; | |
| 288 | } | |
| 289 | ||
| 290 | /* * | |
| 291 | * @param st udyApprova lId | |
| 292 | * the stud yApprovalI d to set | |
| 293 | * / | |
| 294 | pu blic void setStudyAp provalId(i nt studyAp provalId) { | |
| 295 | this .studyAppr ovalId = s tudyApprov alId; | |
| 296 | } | |
| 297 | ||
| 298 | /* * | |
| 299 | * @return t he studyAp proval | |
| 300 | * / | |
| 301 | pu blic Study ApprovalDT O getStudy Approval() { | |
| 302 | retu rn studyAp proval; | |
| 303 | } | |
| 304 | ||
| 305 | /* * | |
| 306 | * @param st udyApprova l | |
| 307 | * the stud yApproval to set | |
| 308 | * / | |
| 309 | pu blic void setStudyAp proval(Stu dyApproval DTO studyA pproval) { | |
| 310 | this .studyAppr oval = stu dyApproval ; | |
| 311 | } | |
| 312 | ||
| 313 | /* * | |
| 314 | * @return t he sourceI d | |
| 315 | * / | |
| 316 | pu blic int g etSourceId () { | |
| 317 | retu rn sourceI d; | |
| 318 | } | |
| 319 | ||
| 320 | /* * | |
| 321 | * @param so urceId | |
| 322 | * the sour ceId to se t | |
| 323 | * / | |
| 324 | pu blic void setSourceI d(int sour ceId) { | |
| 325 | this .sourceId = sourceId ; | |
| 326 | } | |
| 327 | ||
| 328 | /* * | |
| 329 | * @return t he source | |
| 330 | * / | |
| 331 | pu blic Sourc eDTO getSo urce() { | |
| 332 | retu rn source; | |
| 333 | } | |
| 334 | ||
| 335 | /* * | |
| 336 | * @param so urce | |
| 337 | * the sour ce to set | |
| 338 | * / | |
| 339 | pu blic void setSource( SourceDTO source) { | |
| 340 | this .source = source; | |
| 341 | } | |
| 342 | ||
| 343 | /* * | |
| 344 | * @return t he dataTyp eId | |
| 345 | * / | |
| 346 | pu blic int g etDataType Id() { | |
| 347 | retu rn dataTyp eId; | |
| 348 | } | |
| 349 | ||
| 350 | /* * | |
| 351 | * @param da taTypeId t he dataTyp eId to set | |
| 352 | * / | |
| 353 | pu blic void setDataTyp eId(int da taTypeId) { | |
| 354 | this .dataTypeI d = dataTy peId; | |
| 355 | } | |
| 356 | ||
| 357 | /* * | |
| 358 | * @return t he dataTyp e | |
| 359 | * / | |
| 360 | pu blic DataT ypeDTO get DataType() { | |
| 361 | retu rn dataTyp e; | |
| 362 | } | |
| 363 | ||
| 364 | /* * | |
| 365 | * @param da taType the dataType to set | |
| 366 | * / | |
| 367 | pu blic void setDataTyp e(DataType DTO dataTy pe) { | |
| 368 | this .dataType = dataType ; | |
| 369 | } | |
| 370 | ||
| 371 | ||
| 372 | ||
| 373 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.