/**
 * Copyright 2015 LinkedIn Corp. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 */
package wherehows.models;

import lombok.Data;

import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;

@Data
@Entity
@Table(name = "users")
public class User {

    @Id
    @Column(name = "id")
    private int id;

    @Column(name = "username")
    private String userName; // ldap user id

    @Column(name = "department_number")
    private int departmentNum;

    @Column(name = "email")
    private String email;

    @Column(name = "name")
    private String name; // ldap display name

    UserSetting userSetting;
}

@@ -535,29 +535,8 @@
 s;%0A%0A
-import lombok.Data;%0A%0A
 impo
@@ -658,16 +658,73 @@
 .Table;%0A
+import javax.persistence.Transient;%0Aimport lombok.Data;%0A%0A
 %0A@Data%0A@
@@ -778,18 +778,14 @@
  %7B%0A%0A
-  
   @Id%0A
-  
   @C
@@ -803,18 +803,16 @@
 = %22id%22)%0A
-  
   privat
@@ -822,18 +822,16 @@
 nt id;%0A%0A
-  
   @Colum
@@ -847,26 +847,24 @@
 %22username%22)%0A
-  
   private St
@@ -893,26 +893,24 @@
  user id%0A%0A  
- 
- 
 @Column(name
@@ -933,18 +933,16 @@
 umber%22)%0A
-  
   privat
@@ -963,18 +963,16 @@
 ntNum;%0A%0A
-  
   @Colum
@@ -989,18 +989,16 @@
 email%22)%0A
-  
   privat
@@ -1016,18 +1016,16 @@
 ail;%0A%0A  
- 
- 
 @Column(
@@ -1041,18 +1041,16 @@
 ame%22)%0A  
- 
- 
 private 
@@ -1086,17 +1086,36 @@
 name%0A%0A  
- 
+@Transient%0A  private
  UserSet

Mark transient field for hibernate to fix mapping issue (#682)