OpenMRS

Timestamp:

05/09/08 10:53:35 (2 months ago)

Author:

bwolfe

Message:

Merging report-api-refactoring to trunk [2696]:[4157]

Files:

• openmrs/trunk/src/api/org/openmrs/User.java (modified) (24 diffs)

openmrs/trunk/src/api/org/openmrs/User.java

@@ -24 +24 @@
-import org.apache.commons.logging.LogFactory;
-import org.openmrs.util.OpenmrsConstants;
+import org.openmrs.util.OpenmrsUtil;
+import org.simpleframework.xml.Attribute;
+import org.simpleframework.xml.Element;
+import org.simpleframework.xml.load.Replace;
+import org.simpleframework.xml.load.Validate;
-
-/**
@@ -290 +295 @@
-         * @return Returns the systemId.
-         */
+        @Attribute(required=false)
-        public String getSystemId() {
-                return systemId;
@@ -297 +303 @@
-         * @param systemId The systemId to set.
-         */
+        @Attribute(required=false)
-        public void setSystemId(String systemId) {
-                this.systemId = systemId;
@@ -304 +311 @@
-         * @return Returns the userId.
-         */
+        @Attribute(required=true)
-        public Integer getUserId() {
-                return userId;
@@ -311 +319 @@
-         * @param userId The userId to set.
-         */
+        @Attribute(required=true)
-        public void setUserId(Integer userId) {
-                super.setPersonId(userId);
@@ -330 +339 @@
-         * @return Returns the username.
-         */
+        @Attribute(required=false)
-        public String getUsername() {
-                return username;
@@ -337 +347 @@
-         * @param username The username to set.
-         */
+        @Attribute(required=false)
-        public void setUsername(String username) {
-                this.username = username;
@@ -422 +433 @@
-         * @return Returns the creator.
-         */
+        @Element(required=false)
-        public User getCreator() {
-                return creator;
@@ -429 +441 @@
-         * @param creator The creator to set.
-         */
+        @Element(required=false)
-        public void setCreator(User creator) {
-                this.creator = creator;
@@ -436 +449 @@
-         * @return Returns the changedBy.
-         */
+        @Element(required=false)
-        public User getChangedBy() {
-                return changedBy;
@@ -443 +457 @@
-         * @param changedBy The changedBy to set.
-         */
+        @Element(required=false)
-        public void setChangedBy(User changedBy) {
-                this.changedBy = changedBy;
@@ -450 +465 @@
-         * @return Returns the dateChanged.
-         */
+        @Element(required=false)
-        public Date getDateChanged() {
-                return dateChanged;
@@ -457 +473 @@
-         * @param dateChanged The dateChanged to set.
-         */
+        @Element(required=false)
-        public void setDateChanged(Date dateChanged) {
-                this.dateChanged = dateChanged;
@@ -464 +481 @@
-         * @return Returns the dateCreated.
-         */
+        @Element(required=false)
-        public Date getDateCreated() {
-                return dateCreated;
@@ -471 +489 @@
-         * @param dateCreated The dateCreated to set.
-         */
+        @Element(required=false)
-        public void setDateCreated(Date dateCreated) {
-                this.dateCreated = dateCreated;
@@ -478 +497 @@
-         * @return Returns the dateVoided.
-         */
+        @Element(required=false)
-        public Date getDateVoided() {
-                return dateVoided;
@@ -485 +505 @@
-         * @param dateVoided The dateVoided to set.
-         */
+        @Element(required=false)
-        public void setDateVoided(Date dateVoided) {
-                this.dateVoided = dateVoided;
@@ -496 +517 @@
-        }
-        
+        @Attribute(required=true)
-        public Boolean getVoided() {
-                return isVoided();
@@ -503 +525 @@
-         * @param voided The void status to set.
-         */
+        @Attribute(required=true)
-        public void setVoided(Boolean voided) {
-                this.voided = voided;
@@ -510 +533 @@
-         * @return Returns the voidedBy.
-         */
+        @Element(required=false)
-        public User getVoidedBy() {
-                return voidedBy;
@@ -517 +541 @@
-         * @param voidedBy The voidedBy to set.
-         */
+        @Element(required=false)
-        public void setVoidedBy(User voidedBy) {
-                this.voidedBy = voidedBy;
@@ -524 +549 @@
-         * @return Returns the voidReason.
-         */
+        @Element(data=true, required=false)
-        public String getVoidReason() {
-                return voidReason;
@@ -531 +557 @@
-         * @param voidReason The voidReason to set.
-         */
+        @Element(data=true, required=false)
-        public void setVoidReason(String voidReason) {
-                this.voidReason = voidReason;
@@ -550 +577 @@
-                return getFamilyName();
-        }
+        
+        /**
+         * If the serializer wishes, don't serialize this entire object, just the important
+         * parts
+         * 
+         * @param sessionMap serialization session information
+         * @return User object to serialize 
+         * 
+         * @see OpenmrsUtil#isShortSerialization(Map)
+         */
+        @Replace
+        public User replaceSerialization(Map<?, ?> sessionMap) {
+                if (OpenmrsUtil.isShortSerialization(sessionMap)) {
+                        // only serialize the user id
+                        return new User(getUserId());
+                }
+                
+                // don't do short serialization
+                return this;
+        }
+        
+        @Validate
+        public void validateSerialization(Map<?, ?> sessionMap) {
+                if (OpenmrsUtil.isShortSerialization(sessionMap)) {
+                        // only serialize the user id
+                        
+                }
+                
+                return;
+        }
-}