package models;

import javax.persistence.Basic;
import javax.persistence.Entity;
import javax.persistence.Id;

import play.data.validation.Constraints.Required;
import play.db.ebean.Model;
import play.utils.dao.BasicModel;

@Entity
@SuppressWarnings("serial")
public class Council extends Model implements BasicModel<Integer> {

	@Id
	private Integer key;

	@Basic
	@Required
	private String cityId;

	@Basic
	@Required
	private String name;

	@Basic
	@Required
	private String job;
	
	@Basic
	@Required
	private String race;
	
	@Basic
	@Required
	private Integer allies;
	
	@Basic
	@Required
	private Integer enemies;
	
	public Integer getKey() {
		return key;
	}

	public void setKey(Integer key) {
		this.key = key;
	}
	
	public void setCityId(String cityId) {
		this.cityId = cityId;
	}
	
	public String getCityId() {
		return cityId;
	}

	public String getName() {
		return name;
	}

	public void setName(String name) {
		this.name = name;
	}
	
	public String getJob() {
		return job;
	}

	public void setJob(String job) {
		this.job = job;
	}

	public String getRace() {
		return race;
	}

	public void setRace(String race) {
		this.race = race;
	}

	public Integer getAllies() {
		return allies;
	}

	public void setAllies(Integer allies) {
		this.allies = allies;
	}

	public Integer getEnemies() {
		return enemies;
	}

	public void setEnemies(Integer enemies) {
		this.enemies = enemies;
	}

	@Override
	public String toString() {
		return "City [key=" + key + ", name=" + name + "]";
	}
}

@@ -379,22 +379,23 @@
 private 
-String
+Integer
  cityId;
@@ -442,35 +442,24 @@
 e;%0A%0A%09@Basic%0A
-%09@Required%0A
 %09private Str
@@ -473,35 +473,24 @@
 ;%0A%09%0A%09@Basic%0A
-%09@Required%0A
 %09private Str
@@ -505,35 +505,24 @@
 ;%0A%09%0A%09@Basic%0A
-%09@Required%0A
 %09private Int
@@ -540,35 +540,24 @@
 ;%0A%09%0A%09@Basic%0A
-%09@Required%0A
 %09private Int
@@ -698,22 +698,23 @@
 tCityId(
-String
+Integer
  cityId)
@@ -749,30 +749,31 @@
 %7D%0A%09%0A%09public 
-String
+Integer
  getCityId()

Changed cityId to integer