From a0a5551d5feee5e0394adf17fedeb3508064e40e Mon Sep 17 00:00:00 2001 From: Stanislav Usenkov Date: Fri, 5 Aug 2016 12:31:52 +0700 Subject: [PATCH] Fix that id should be long like it is in db. --- .../simsonic/rscPermissions/API/GenericRow.java | 2 +- .../simsonic/rscPermissions/API/RowEntity.java | 2 +- .../rscPermissions/API/RowInheritance.java | 2 +- .../rscPermissions/API/RowPermission.java | 2 +- .../Bukkit/Commands/CommandEntity.java | 4 ++-- .../Engine/Backends/BackendDatabase.java | 8 ++++---- .../Engine/Backends/DatabaseEditor.java | 16 ++++++++-------- .../rscPermissions/Engine/InternalStorage.java | 6 +++--- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/main/java/ru/simsonic/rscPermissions/API/GenericRow.java b/src/main/java/ru/simsonic/rscPermissions/API/GenericRow.java index fc99877..4b87a5d 100644 --- a/src/main/java/ru/simsonic/rscPermissions/API/GenericRow.java +++ b/src/main/java/ru/simsonic/rscPermissions/API/GenericRow.java @@ -4,7 +4,7 @@ import java.sql.Timestamp; public abstract class GenericRow { - public int id; + public long id; public transient String splittedId; public String entity; public EntityType entityType; diff --git a/src/main/java/ru/simsonic/rscPermissions/API/RowEntity.java b/src/main/java/ru/simsonic/rscPermissions/API/RowEntity.java index 0f03929..8491392 100644 --- a/src/main/java/ru/simsonic/rscPermissions/API/RowEntity.java +++ b/src/main/java/ru/simsonic/rscPermissions/API/RowEntity.java @@ -20,7 +20,7 @@ public final class RowEntity extends GenericRow implements Cloneable, Comparable if(compareByPlayerType != 0) return 0 - compareByPlayerType; } - final int compareById = Integer.compare(id, other.id); + final int compareById = Long.compare(id, other.id); if(compareById != 0) return compareById; return entity.compareTo(other.entity); diff --git a/src/main/java/ru/simsonic/rscPermissions/API/RowInheritance.java b/src/main/java/ru/simsonic/rscPermissions/API/RowInheritance.java index 6a186ff..e3f877e 100644 --- a/src/main/java/ru/simsonic/rscPermissions/API/RowInheritance.java +++ b/src/main/java/ru/simsonic/rscPermissions/API/RowInheritance.java @@ -48,6 +48,6 @@ public final class RowInheritance extends ConditionalRow implements Cloneable, C if(compareBySplittedId != 0) return compareBySplittedId; } - return Integer.compare(id, other.id); + return Long.compare(id, other.id); } } diff --git a/src/main/java/ru/simsonic/rscPermissions/API/RowPermission.java b/src/main/java/ru/simsonic/rscPermissions/API/RowPermission.java index b67bfce..72e6eb0 100644 --- a/src/main/java/ru/simsonic/rscPermissions/API/RowPermission.java +++ b/src/main/java/ru/simsonic/rscPermissions/API/RowPermission.java @@ -22,6 +22,6 @@ public final class RowPermission extends ConditionalRow implements Cloneable, Co if(compareBySplittedId != 0) return compareBySplittedId; } - return Integer.compare(id, other.id); + return Long.compare(id, other.id); } } diff --git a/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandEntity.java b/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandEntity.java index 4b1ded2..ab71d8c 100644 --- a/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandEntity.java +++ b/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandEntity.java @@ -398,7 +398,7 @@ public class CommandEntity final ArrayList answer = new ArrayList<>(); final RowInheritance row = new RowInheritance(); row.entity = entity.entity; - row.childType = entity.entityType; + row.entityType = entity.entityType; row.parent = parent; rscp.connection.addInheritance(row); throw new CommandAnswerException("{_LG}All is ok? I don't ready to check it myself."); @@ -436,7 +436,7 @@ public class CommandEntity if(whatToRemove.equalsIgnoreCase(row.parent)) possibleTargets.add(row); } - if(possibleTargets.size() == 0) + if(possibleTargets.isEmpty()) throw new CommandAnswerException("{_LR}Sorry, I don't understand what I have to remove from DB."); if(possibleTargets.size() > 1) throw new CommandAnswerException("{_LR}There are several possibilities what to remove. Please use unique white id."); diff --git a/src/main/java/ru/simsonic/rscPermissions/Engine/Backends/BackendDatabase.java b/src/main/java/ru/simsonic/rscPermissions/Engine/Backends/BackendDatabase.java index 7275a48..f217b12 100644 --- a/src/main/java/ru/simsonic/rscPermissions/Engine/Backends/BackendDatabase.java +++ b/src/main/java/ru/simsonic/rscPermissions/Engine/Backends/BackendDatabase.java @@ -47,7 +47,7 @@ public class BackendDatabase extends ConnectionMySQL while(rs.next()) { RowEntity row = new RowEntity(); - row.id = rs.getInt("id"); + row.id = rs.getLong("id"); row.entity = rs.getString("entity"); row.entityType = EntityType.byValue(rs.getInt("entity_type")); row.prefix = rs.getString("prefix"); @@ -70,7 +70,7 @@ public class BackendDatabase extends ConnectionMySQL while(rs.next()) { RowPermission row = new RowPermission(); - row.id = rs.getInt("id"); + row.id = rs.getLong("id"); row.entity = rs.getString("entity"); row.entityType = EntityType.byValue(rs.getInt("entity_type")); row.permission = rs.getString("permission"); @@ -95,10 +95,10 @@ public class BackendDatabase extends ConnectionMySQL while(rs.next()) { RowInheritance row = new RowInheritance(); - row.id = rs.getInt("id"); + row.id = rs.getLong("id"); row.entity = rs.getString("entity"); row.parent = rs.getString("parent"); - row.childType = EntityType.byValue(rs.getInt("inheritance_type")); + row.entityType = EntityType.byValue(rs.getInt("inheritance_type")); row.priority = rs.getInt("inheritance_priority"); row.destinationSource = rs.getString("destination"); row.expirience = rs.getInt("expirience"); diff --git a/src/main/java/ru/simsonic/rscPermissions/Engine/Backends/DatabaseEditor.java b/src/main/java/ru/simsonic/rscPermissions/Engine/Backends/DatabaseEditor.java index b3f0c90..97fcc00 100644 --- a/src/main/java/ru/simsonic/rscPermissions/Engine/Backends/DatabaseEditor.java +++ b/src/main/java/ru/simsonic/rscPermissions/Engine/Backends/DatabaseEditor.java @@ -60,25 +60,25 @@ public class DatabaseEditor extends BackendDatabase public void addPermission(RowPermission row) { super.insertPermissions( - (row.id != 0 ? (long)row.id : null), + row.id != 0 ? row.id : null, row.entity, row.entityType, row.permission, row.value, - row.destination.toString(), - (row.expirience != 0 ? row.expirience : null), + row.destination != null ? row.destination.toString() : null, + row.expirience != 0 ? row.expirience : null, /* FIX LIFETIME */ null); } public void addInheritance(RowInheritance row) { super.insertInheritance( - (row.id != 0 ? (long)row.id : null), + row.id != 0 ? row.id : null, row.entity, row.parent, - row.childType, - row.priority, - row.destination.toString(), - (row.expirience != 0 ? row.expirience : null), + row.entityType, + row.priority != 0 ? row.priority : null, + row.destination != null ? row.destination.toString() : null, + row.expirience != 0 ? row.expirience : null, /* FIX LIFETIME */ null); } private DatabaseContents prepareChanges() diff --git a/src/main/java/ru/simsonic/rscPermissions/Engine/InternalStorage.java b/src/main/java/ru/simsonic/rscPermissions/Engine/InternalStorage.java index 8f20901..6ce64f1 100644 --- a/src/main/java/ru/simsonic/rscPermissions/Engine/InternalStorage.java +++ b/src/main/java/ru/simsonic/rscPermissions/Engine/InternalStorage.java @@ -56,7 +56,7 @@ class InternalStorage for(RowInheritance row : contents.inheritance) { names_g.add(row.parent); - if(row.childType == EntityType.GROUP) + if(row.entityType == EntityType.GROUP) names_g.add(row.entity); else names_u.add(row.entity); @@ -121,7 +121,7 @@ class InternalStorage final ArrayList inheritance_g2g = new ArrayList<>(); final ArrayList inheritance_g2u = new ArrayList<>(); for(RowInheritance row : rows) - if(row.childType == EntityType.GROUP) + if(row.entityType == EntityType.GROUP) { row.entityChild = entities_g.get(row.entity.toLowerCase()); row.entityParent = entities_g.get(row.parent.toLowerCase()); @@ -151,7 +151,7 @@ class InternalStorage Collections.sort(inheritances); entry.getValue().inheritance = inheritances.toArray(new RowInheritance[inheritances.size()]); } - defaultInheritance.childType = EntityType.PLAYER; + defaultInheritance.entityType = EntityType.PLAYER; defaultInheritance.entityParent = entities_g.get(defaultInheritance.parent.toLowerCase()); } public synchronized RowEntity findUserEntity(String entity)