Replaces calls of fetchValue() to either one of the new variants

Fixes: SIRI-1039
scireum · Dec 16, 2024 · 35cdb77 · 35cdb77
1 parent 74827f5
commit 35cdb77
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 13 deletions.
diff --git a/src/main/java/sirius/biz/storage/layer2/jdbc/SQLVariant.java b/src/main/java/sirius/biz/storage/layer2/jdbc/SQLVariant.java
@@ -109,7 +109,7 @@ public class SQLVariant extends SQLEntity implements BlobVariant {
 
     @AfterDelete
     protected void onDelete() {
-        SQLBlob sqlBlob = sourceBlob.fetchValue();
+        SQLBlob sqlBlob = sourceBlob.forceFetchValue();
         if (sqlBlob == null) {
             return;
         }

diff --git a/src/main/java/sirius/biz/storage/layer2/mongo/MongoVariant.java b/src/main/java/sirius/biz/storage/layer2/mongo/MongoVariant.java
@@ -107,7 +107,7 @@ public class MongoVariant extends MongoEntity implements BlobVariant {
 
     @AfterDelete
     protected void onDelete() {
-        MongoBlob mongoBlob = blob.fetchValue();
+        MongoBlob mongoBlob = blob.forceFetchValue();
         if (mongoBlob == null) {
             return;
         }

diff --git a/src/main/java/sirius/biz/storage/legacy/VersionManager.java b/src/main/java/sirius/biz/storage/legacy/VersionManager.java
@@ -170,7 +170,7 @@ private void computeVersion(VirtualObject object, String version) {
     }
 
     private void performVersionComputation(VirtualObjectVersion objectVersion) {
-        VirtualObject object = objectVersion.getVirtualObject().fetchValue();
+        VirtualObject object = objectVersion.getVirtualObject().fetchCachedValue();
         try {
             Tuple<Integer, Integer> size = Tuple.create(0, 0);
             Tuple<Integer, Integer> extendedSize = Tuple.create(0, 0);

diff --git a/src/main/java/sirius/biz/storage/legacy/VirtualObjectVersion.java b/src/main/java/sirius/biz/storage/legacy/VirtualObjectVersion.java
@@ -100,8 +100,8 @@ protected void removePhysicalFile() {
     @AfterDelete
     protected void removeVersionFromCaches() {
         if (this.getVirtualObject().isFilled()) {
-            versionManager.clearCacheForVirtualObject(this.getVirtualObject().fetchValue());
-            storage.clearCacheForVirtualObject(this.getVirtualObject().fetchValue());
+            versionManager.clearCacheForVirtualObject(this.getVirtualObject().forceFetchValue());
+            storage.clearCacheForVirtualObject(this.getVirtualObject().fetchCachedValue());
         }
     }
 

diff --git a/src/main/java/sirius/biz/tenants/TenantController.java b/src/main/java/sirius/biz/tenants/TenantController.java
@@ -407,7 +407,7 @@ public void selectTenant(final WebContext webContext, String tenantId) {
                         .causedByUser(account.getUniqueName(), account.getUserAccountData().getLogin().getUsername())
                         .forUser(account.getUniqueName(), account.getUserAccountData().getLogin().getUsername())
                         .forTenant(account.getTenant().getIdAsString(),
-                                   account.getTenant().fetchValue().getTenantData().getName())
+                                   account.getTenant().forceFetchValue().getTenantData().getName())
                         .log();
 
                 webContext.setSessionValue(UserContext.getCurrentScope().getScopeId()

diff --git a/src/main/java/sirius/biz/tenants/TenantUserManager.java b/src/main/java/sirius/biz/tenants/TenantUserManager.java
@@ -451,9 +451,10 @@ public UserInfo findUserByName(@Nullable WebContext webContext, String user) {
         }
 
         U account = optionalAccount.get();
+        T tenant = account.getTenant().forceFetchValue();
 
         userAccountCache.put(account.getUniqueName(), account);
-        tenantsCache.put(account.getTenant().fetchValue().getIdAsString(), account.getTenant().fetchValue());
+        tenantsCache.put(tenant.getIdAsString(), tenant);
         rolesCache.remove(account.getUniqueName());
         configCache.remove(account.getUniqueName());
 
@@ -569,7 +570,8 @@ protected U fetchAccount(@Nonnull String accountId) {
                 return null;
             }
             userAccountCache.put(account.getUniqueName(), account);
-            tenantsCache.put(account.getTenant().fetchValue().getIdAsString(), account.getTenant().fetchValue());
+            T tenant = account.getTenant().forceFetchValue();
+            tenantsCache.put(tenant.getIdAsString(), tenant);
             rolesCache.remove(account.getUniqueName());
             configCache.remove(account.getUniqueName());
 

diff --git a/src/main/java/sirius/biz/tenants/UserAccountData.java b/src/main/java/sirius/biz/tenants/UserAccountData.java
@@ -239,7 +239,7 @@ public <A> Optional<A> tryAs(Class<A> adapterType) {
     }
 
     protected Tenant<?> getTenant() {
-        return ((UserAccount<?, ?>) userObject).getTenant().fetchValue();
+        return ((UserAccount<?, ?>) userObject).getTenant().forceFetchValue();
     }
 
     @Override

diff --git a/src/main/java/sirius/biz/tenants/UserAccountSearchProvider.java b/src/main/java/sirius/biz/tenants/UserAccountSearchProvider.java
@@ -87,7 +87,7 @@ public void query(String query, int maxResults, Consumer<OpenSearchResult> resul
             } else {
                 openSearchResult.withDescription(userAccount
                                                  + " ("
-                                                 + userAccount.getTenant().fetchValue().toString()
+                                                 + userAccount.getTenant().fetchCachedValue().toString()
                                                  + ")")
                                 .withURL("/tenants/select/"
                                          + userAccount.getTenant().getIdAsString()
@@ -103,9 +103,9 @@ public void query(String query, int maxResults, Consumer<OpenSearchResult> resul
                                                                 <t:smartValue type="tenant"
                                                                     id="@generateId('smarty-useraccount-%s')"
                                                                     payload="@user.getTenantAsString()"
-                                                                    label="@user.getTenant().fetchValue().toString()"/>
+                                                                    label="@user.getTenant().fetchCachedValue().toString()"/>
                                                                 <i:else>
-                                                                    @user.getTenant().fetchValue().toString()
+                                                                    @user.getTenant().fetchCachedValue().toString()
                                                                 </i:else>
                                                               </i:if>
                                                               )

diff --git a/src/main/resources/default/templates/biz/tenants/tenant-extended.html.pasta b/src/main/resources/default/templates/biz/tenants/tenant-extended.html.pasta
@@ -40,7 +40,7 @@
                             suggestionUri="/tenants/autocomplete">
                 <i:if test="tenant.getParent().isFilled()">
                     <option value="@tenant.getParent().getId()" selected="selected">
-                        @tenant.getParent().fetchValue()
+                        @tenant.getParent().fetchCachedValue()
                     </option>
                 </i:if>
             </t:singleSelect>