Merge pull request #176 from scireum/tbi/versionupdate

Updates the kernel, db and web versions
scireum · Aug 29, 2018 · a3d5828 · a3d5828
2 parents 678284c + 3fa7108
commit a3d5828
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 13 deletions.
diff --git a/pom.xml b/pom.xml
@@ -17,9 +17,9 @@
     <url>http://www.sirius-lib.net</url>
 
     <properties>
-        <sirius.kernel>12.0-rc14</sirius.kernel>
-        <sirius.web>19.0-rc8</sirius.web>
-        <sirius.db>5.0-rc13</sirius.db>
+        <sirius.kernel>12.0-rc18</sirius.kernel>
+        <sirius.web>19.0-rc11</sirius.web>
+        <sirius.db>5.0-rc16</sirius.db>
     </properties>
 
     <dependencies>

diff --git a/src/main/java/sirius/biz/jdbc/storage/Storage.java b/src/main/java/sirius/biz/jdbc/storage/Storage.java
@@ -84,7 +84,7 @@ public class Storage {
 
     private static final Pattern NON_URL_CHARACTERS = Pattern.compile("[^a-zA-Z0-9_.]");
 
-    private static Cache<String, VirtualObject> virtualObjectCache = CacheManager.createCache("virtual-objects");
+    private static Cache<String, VirtualObject> virtualObjectCache = CacheManager.createCoherentCache("virtual-objects");
 
     @Part
     private OMA oma;

diff --git a/src/main/java/sirius/biz/jdbc/storage/StoredObjectRefProperty.java b/src/main/java/sirius/biz/jdbc/storage/StoredObjectRefProperty.java
@@ -107,7 +107,7 @@ protected Object transformFromJDBC(Value object) {
     }
 
     @Override
-    protected void setValue(Object entity, Object object) {
+    public void setValue(Object entity, Object object) {
         this.setValueToField(object, entity);
     }
 

diff --git a/src/main/java/sirius/biz/jdbc/storage/VersionManager.java b/src/main/java/sirius/biz/jdbc/storage/VersionManager.java
@@ -74,7 +74,7 @@ public class VersionManager {
     private Boolean commandPresent;
 
     private Cache<String, Tuple<VirtualObject, Map<String, String>>> logicalToPhysicalCache =
-            CacheManager.createCache("storage-object-metadata");
+            CacheManager.createCoherentCache("storage-object-metadata");
 
     private static final String PNG_IMAGE = "png";
     private static final String JPG_IMAGE = "jpg";

diff --git a/src/main/java/sirius/biz/jdbc/tenants/TenantUserManager.java b/src/main/java/sirius/biz/jdbc/tenants/TenantUserManager.java
@@ -114,10 +114,10 @@ public class TenantUserManager extends GenericUserManager {
     @Part
     private static AuditLog auditLog;
 
-    private static Cache<String, Set<String>> rolesCache = CacheManager.createCache("tenants-roles");
-    private static Cache<String, UserAccount> userAccountCache = CacheManager.createCache("tenants-users");
-    private static Cache<String, Tenant> tenantsCache = CacheManager.createCache("tenants-tenants");
-    private static Cache<String, Tuple<UserSettings, String>> configCache = CacheManager.createCache("tenants-configs");
+    private static Cache<String, Set<String>> rolesCache = CacheManager.createCoherentCache("tenants-roles");
+    private static Cache<String, UserAccount> userAccountCache = CacheManager.createCoherentCache("tenants-users");
+    private static Cache<String, Tenant> tenantsCache = CacheManager.createCoherentCache("tenants-tenants");
+    private static Cache<String, Tuple<UserSettings, String>> configCache = CacheManager.createCoherentCache("tenants-configs");
 
     protected TenantUserManager(ScopeInfo scope, Extension config) {
         super(scope, config);

diff --git a/src/main/java/sirius/biz/jdbc/tenants/Tenants.java b/src/main/java/sirius/biz/jdbc/tenants/Tenants.java
@@ -41,7 +41,7 @@ public class Tenants {
     @Part
     private OMA oma;
 
-    private Cache<Long, Boolean> tenantsWithChildren = CacheManager.createCache("tenants-children");
+    private Cache<String, Boolean> tenantsWithChildren = CacheManager.createCoherentCache("tenants-children");
 
     /**
      * Returns the current user as {@link UserAccount} which is logged in.
@@ -130,7 +130,8 @@ public boolean hasTenant() {
      * id is unknown.
      */
     public boolean hasChildTenants(long tenantId) {
-        return tenantsWithChildren.get(tenantId, id -> oma.select(Tenant.class).eq(Tenant.PARENT, tenantId).exists());
+        return tenantsWithChildren.get(String.valueOf(tenantId),
+                                       id -> oma.select(Tenant.class).eq(Tenant.PARENT, tenantId).exists());
     }
 
     /**

diff --git a/src/main/java/sirius/biz/s3/ObjectStore.java b/src/main/java/sirius/biz/s3/ObjectStore.java
@@ -21,7 +21,7 @@ public class ObjectStore {
     protected final AmazonS3Client client;
     protected final String bucketSuffix;
     //TODO bad idea
-    private final Cache<String, Boolean> bucketCache = CacheManager.createCache("storage-buckets");
+    private final Cache<String, Boolean> bucketCache = CacheManager.createCoherentCache("storage-buckets");
 
     public ObjectStore(AmazonS3Client client, String bucketSuffix) {
         this.client = client;