diff --git a/samples/client/petstore/java/src/main/java/com/wordnik/petstore/model/Pet.java b/samples/client/petstore/java/src/main/java/com/wordnik/petstore/model/Pet.java
index ae54341612d..04c5b11ccea 100644
--- a/samples/client/petstore/java/src/main/java/com/wordnik/petstore/model/Pet.java
+++ b/samples/client/petstore/java/src/main/java/com/wordnik/petstore/model/Pet.java
@@ -4,20 +4,13 @@ import java.util.*;
 import com.wordnik.petstore.model.Category;
 import com.wordnik.petstore.model.Tag;
 public class Pet {
-  private Long id = null;
   private List<Tag> tags = new ArrayList<Tag>();
+  private Long id = null;
   private Category category = null;
   /* pet status in the store */
   private String status = null;
   private String name = null;
   private List<String> photoUrls = new ArrayList<String>();
-  public Long getId() {
-    return id;
-  }
-  public void setId(Long id) {
-    this.id = id;
-  }
-
   public List<Tag> getTags() {
     return tags;
   }
@@ -25,6 +18,13 @@ public class Pet {
     this.tags = tags;
   }
 
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
   public Category getCategory() {
     return category;
   }
@@ -57,8 +57,8 @@ public class Pet {
   public String toString()  {
     StringBuilder sb = new StringBuilder();
     sb.append("class Pet {\n");
-    sb.append("  id: ").append(id).append("\n");
     sb.append("  tags: ").append(tags).append("\n");
+    sb.append("  id: ").append(id).append("\n");
     sb.append("  category: ").append(category).append("\n");
     sb.append("  status: ").append(status).append("\n");
     sb.append("  name: ").append(name).append("\n");
diff --git a/samples/client/petstore/java/src/main/java/com/wordnik/petstore/model/User.java b/samples/client/petstore/java/src/main/java/com/wordnik/petstore/model/User.java
index 7c96c958e3a..5492bebd37c 100644
--- a/samples/client/petstore/java/src/main/java/com/wordnik/petstore/model/User.java
+++ b/samples/client/petstore/java/src/main/java/com/wordnik/petstore/model/User.java
@@ -3,8 +3,8 @@ package com.wordnik.petstore.model;
 public class User {
   private Long id = null;
   private String lastName = null;
-  private String username = null;
   private String phone = null;
+  private String username = null;
   private String email = null;
   /* User Status */
   private Integer userStatus = null;
@@ -24,13 +24,6 @@ public class User {
     this.lastName = lastName;
   }
 
-  public String getUsername() {
-    return username;
-  }
-  public void setUsername(String username) {
-    this.username = username;
-  }
-
   public String getPhone() {
     return phone;
   }
@@ -38,6 +31,13 @@ public class User {
     this.phone = phone;
   }
 
+  public String getUsername() {
+    return username;
+  }
+  public void setUsername(String username) {
+    this.username = username;
+  }
+
   public String getEmail() {
     return email;
   }
@@ -72,8 +72,8 @@ public class User {
     sb.append("class User {\n");
     sb.append("  id: ").append(id).append("\n");
     sb.append("  lastName: ").append(lastName).append("\n");
-    sb.append("  username: ").append(username).append("\n");
     sb.append("  phone: ").append(phone).append("\n");
+    sb.append("  username: ").append(username).append("\n");
     sb.append("  email: ").append(email).append("\n");
     sb.append("  userStatus: ").append(userStatus).append("\n");
     sb.append("  firstName: ").append(firstName).append("\n");