Fixes #84 and fixes #82.

Turns out I had to remove the @NotNull from the auto-ident pk I added.
maartenl · Jul 17, 2019 · 24582af · 24582af
1 parent b39ac17
commit 24582af
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/karchangame/src/main/java/mmud/commands/guild/ApplyCommand.java b/karchangame/src/main/java/mmud/commands/guild/ApplyCommand.java
@@ -16,8 +16,6 @@
  */
 package mmud.commands.guild;
 
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
 import mmud.Attributes;
 import mmud.commands.NormalCommand;
 import mmud.database.entities.characters.User;
@@ -69,8 +67,9 @@ public DisplayInterface run(String command, User aUser) throws MudException
             return aUser.getRoom();
         }
         aUser.setAttribute(Attributes.GUILDWISH, guild.getName());
+
         aUser.writeMessage("You have applied to guild <I>" + guild.getTitle()
-                + "</I>.<BR>\r\n");
+                + "</I>.<BR>\r\n");        
         return aUser.getRoom();
     }
 

diff --git a/karchangame/src/main/java/mmud/database/entities/game/Charattribute.java b/karchangame/src/main/java/mmud/database/entities/game/Charattribute.java
@@ -20,6 +20,8 @@
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.Lob;
@@ -49,11 +51,11 @@ public class Charattribute implements Serializable, Attribute
   private static final long serialVersionUID = 1L;
 
   @Id
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
   @Basic(optional = false)
-  @NotNull
   @Column(name = "attrid")
   private Long attributeId;
-
+  
   @Basic(optional = false)
   @NotNull
   @Size(min = 1, max = 32)

diff --git a/karchangame/src/main/java/mmud/database/entities/game/Roomattribute.java b/karchangame/src/main/java/mmud/database/entities/game/Roomattribute.java
@@ -20,6 +20,8 @@
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.Lob;
@@ -48,8 +50,8 @@ public class Roomattribute implements Serializable, Attribute
   private static final long serialVersionUID = 1L;
 
   @Id
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
   @Basic(optional = false)
-  @NotNull
   @Column(name = "attrid")
   private Long attributeId;
 

diff --git a/karchangame/src/main/java/mmud/database/entities/items/Itemattribute.java b/karchangame/src/main/java/mmud/database/entities/items/Itemattribute.java
@@ -20,6 +20,8 @@
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.Lob;
@@ -49,8 +51,8 @@ public class Itemattribute implements Serializable, Attribute
   private static final long serialVersionUID = 1L;
 
   @Id
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
   @Basic(optional = false)
-  @NotNull
   @Column(name = "attrid")
   private Long attributeId;