[Misc] Use pattern matching for instanceof in model, user, livedata and lesscss modules (SonarCloud java:S6201)

vmassol · vmassol · commit a9ad8f30178c · 2026-07-15T03:19:51.000Z
Replace instanceof-check-and-cast patterns with instanceof pattern variables
across the model-api, user-default, livedata-livetable and lesscss-default
modules, as flagged by SonarCloud rule java:S6201.

Co-Authored-By: Vincent Massol &lt;vincent@massol.net&gt;
diff --git a/xwiki-platform-core/xwiki-platform-lesscss/xwiki-platform-lesscss-default/src/main/java/org/xwiki/lesscss/internal/cache/CacheKeyFactory.java b/xwiki-platform-core/xwiki-platform-lesscss/xwiki-platform-lesscss-default/src/main/java/org/xwiki/lesscss/internal/cache/CacheKeyFactory.java
@@ -82,8 +82,8 @@ public String getCacheKey(LESSResourceReference lessResourceReference, SkinRefer
             Request request = container.getRequest();
             List<String> excludes = Arrays.asList("skin", "colorTheme", "colorThemeVersion", "language", "docVersion",
                 XWiki.CACHE_VERSION);
-            if (request instanceof ServletRequest) {
-                Map<String, String[]> parameters = ((ServletRequest) request).getHttpServletRequest().getParameterMap();
+            if (request instanceof ServletRequest servletRequest) {
+                Map<String, String[]> parameters = servletRequest.getHttpServletRequest().getParameterMap();
                 for (Map.Entry<String, String[]> entry : parameters.entrySet()) {
                     if (!excludes.contains(entry.getKey())) {
                         String[] values = entry.getValue();
diff --git a/xwiki-platform-core/xwiki-platform-lesscss/xwiki-platform-lesscss-default/src/main/java/org/xwiki/lesscss/internal/colortheme/DocumentColorThemeReference.java b/xwiki-platform-core/xwiki-platform-lesscss/xwiki-platform-lesscss-default/src/main/java/org/xwiki/lesscss/internal/colortheme/DocumentColorThemeReference.java
@@ -50,8 +50,7 @@ public DocumentColorThemeReference(DocumentReference colorThemeDocument,
     @Override
     public boolean equals(Object o)
     {
-        if (o instanceof DocumentColorThemeReference) {
-            DocumentColorThemeReference documentSkinReference = (DocumentColorThemeReference) o;
+        if (o instanceof DocumentColorThemeReference documentSkinReference) {
             return colorThemeDocument.equals(documentSkinReference.colorThemeDocument);
         }
         return false;
diff --git a/xwiki-platform-core/xwiki-platform-lesscss/xwiki-platform-lesscss-default/src/main/java/org/xwiki/lesscss/internal/colortheme/NamedColorThemeReference.java b/xwiki-platform-core/xwiki-platform-lesscss/xwiki-platform-lesscss-default/src/main/java/org/xwiki/lesscss/internal/colortheme/NamedColorThemeReference.java
@@ -42,8 +42,7 @@ public NamedColorThemeReference(String colorThemeName)
     @Override
     public boolean equals(Object o)
     {
-        if (o instanceof NamedColorThemeReference) {
-            NamedColorThemeReference namedColorThemeReference = (NamedColorThemeReference) o;
+        if (o instanceof NamedColorThemeReference namedColorThemeReference) {
             return colorThemeName.equals(namedColorThemeReference.colorThemeName);
         }
         return false;
diff --git a/xwiki-platform-core/xwiki-platform-lesscss/xwiki-platform-lesscss-default/src/main/java/org/xwiki/lesscss/internal/compiler/CachedLESSCompiler.java b/xwiki-platform-core/xwiki-platform-lesscss/xwiki-platform-lesscss-default/src/main/java/org/xwiki/lesscss/internal/compiler/CachedLESSCompiler.java
@@ -109,9 +109,9 @@ public String compute(LESSResourceReference lessResourceReference, boolean inclu
             if (useVelocity) {
                 DocumentReference authorReference;
                 DocumentReference documentReference;
-                if (lessResourceReference instanceof WikiLESSResourceReference) {
-                    authorReference = ((WikiLESSResourceReference) lessResourceReference).getAuthorReference();
-                    documentReference = ((WikiLESSResourceReference) lessResourceReference).getDocumentReference();
+                if (lessResourceReference instanceof WikiLESSResourceReference wikiLESSResourceReference) {
+                    authorReference = wikiLESSResourceReference.getAuthorReference();
+                    documentReference = wikiLESSResourceReference.getDocumentReference();
                 } else {
                     authorReference = InternalTemplateManager.SUPERADMIN_REFERENCE;
                     documentReference = null;
diff --git a/xwiki-platform-core/xwiki-platform-lesscss/xwiki-platform-lesscss-default/src/main/java/org/xwiki/lesscss/internal/resources/LESSObjectPropertyResourceReference.java b/xwiki-platform-core/xwiki-platform-lesscss/xwiki-platform-lesscss-default/src/main/java/org/xwiki/lesscss/internal/resources/LESSObjectPropertyResourceReference.java
@@ -64,9 +64,7 @@ public LESSObjectPropertyResourceReference(ObjectPropertyReference objectPropert
     @Override
     public boolean equals(Object o)
     {
-        if (o instanceof LESSObjectPropertyResourceReference) {
-            LESSObjectPropertyResourceReference lessObjectPropertyResourceReference =
-                (LESSObjectPropertyResourceReference) o;
+        if (o instanceof LESSObjectPropertyResourceReference lessObjectPropertyResourceReference) {
             return objectPropertyReference.equals(lessObjectPropertyResourceReference.objectPropertyReference);
         }
 
diff --git a/xwiki-platform-core/xwiki-platform-lesscss/xwiki-platform-lesscss-default/src/main/java/org/xwiki/lesscss/internal/resources/LESSSkinFileResourceReference.java b/xwiki-platform-core/xwiki-platform-lesscss/xwiki-platform-lesscss-default/src/main/java/org/xwiki/lesscss/internal/resources/LESSSkinFileResourceReference.java
@@ -55,8 +55,8 @@ public LESSSkinFileResourceReference(String fileName, TemplateManager templateMa
     @Override
     public boolean equals(Object o)
     {
-        if (o instanceof LESSSkinFileResourceReference) {
-            return fileName.equals(((LESSSkinFileResourceReference) o).fileName);
+        if (o instanceof LESSSkinFileResourceReference lessSkinFileResourceReference) {
+            return fileName.equals(lessSkinFileResourceReference.fileName);
         }
 
         return false;
diff --git a/xwiki-platform-core/xwiki-platform-lesscss/xwiki-platform-lesscss-default/src/main/java/org/xwiki/lesscss/internal/skin/DocumentSkinReference.java b/xwiki-platform-core/xwiki-platform-lesscss/xwiki-platform-lesscss-default/src/main/java/org/xwiki/lesscss/internal/skin/DocumentSkinReference.java
@@ -57,8 +57,7 @@ public DocumentReference getSkinDocument()
     @Override
     public boolean equals(Object o)
     {
-        if (o instanceof DocumentSkinReference) {
-            DocumentSkinReference documentSkinReference = (DocumentSkinReference) o;
+        if (o instanceof DocumentSkinReference documentSkinReference) {
             return skinDocument.equals(documentSkinReference.skinDocument);
         }
         return false;
diff --git a/xwiki-platform-core/xwiki-platform-lesscss/xwiki-platform-lesscss-default/src/main/java/org/xwiki/lesscss/internal/skin/FSSkinReference.java b/xwiki-platform-core/xwiki-platform-lesscss/xwiki-platform-lesscss-default/src/main/java/org/xwiki/lesscss/internal/skin/FSSkinReference.java
@@ -49,8 +49,7 @@ public String getSkinName()
     @Override
     public boolean equals(Object o)
     {
-        if (o instanceof FSSkinReference) {
-            FSSkinReference fsSkinReference = (FSSkinReference) o;
+        if (o instanceof FSSkinReference fsSkinReference) {
             return skinName.equals(fsSkinReference.skinName);
         }
         return false;
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-livetable/src/main/java/org/xwiki/livedata/internal/livetable/DefaultLiveDataConfigurationResolver.java b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-livetable/src/main/java/org/xwiki/livedata/internal/livetable/DefaultLiveDataConfigurationResolver.java
@@ -114,8 +114,8 @@ protected LiveDataConfiguration getDefaultConfiguration(LiveDataConfiguration co
     private LiveDataPropertyDescriptorStore getPropertyStore(Source sourceConfig)
     {
         LiveDataPropertyDescriptorStore propertyStore = this.propertyStoreProvider.get();
-        if (propertyStore instanceof WithParameters && sourceConfig != null) {
-            ((WithParameters) propertyStore).getParameters().putAll(sourceConfig.getParameters());
+        if (propertyStore instanceof WithParameters withParameters && sourceConfig != null) {
+            withParameters.getParameters().putAll(sourceConfig.getParameters());
         }
         return propertyStore;
     }
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-livetable/src/main/java/org/xwiki/livedata/internal/livetable/LiveTableLiveDataEntryStore.java b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-livetable/src/main/java/org/xwiki/livedata/internal/livetable/LiveTableLiveDataEntryStore.java
@@ -135,10 +135,10 @@ private JsonNode getLiveTableResultsJSON(LiveDataQuery query, ObjectMapper objec
             Object template = query.getSource().getParameters().get(LiveTableRequestHandler.TEMPLATE);
             Object resultPage = query.getSource().getParameters().get(LiveTableRequestHandler.RESULT_PAGE);
             String liveTableResultsJSON;
-            if (template instanceof String) {
-                liveTableResultsJSON = this.resultsRenderer.getLiveTableResultsFromTemplate((String) template, query);
-            } else if (resultPage instanceof String) {
-                liveTableResultsJSON = this.resultsRenderer.getLiveTableResultsFromPage((String) resultPage, query);
+            if (template instanceof String templateString) {
+                liveTableResultsJSON = this.resultsRenderer.getLiveTableResultsFromTemplate(templateString, query);
+            } else if (resultPage instanceof String resultPageString) {
+                liveTableResultsJSON = this.resultsRenderer.getLiveTableResultsFromPage(resultPageString, query);
             } else {
                 liveTableResultsJSON =
                     this.resultsRenderer.getLiveTableResultsFromPage("XWiki.LiveTableResults", query);
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-livetable/src/main/java/org/xwiki/livedata/internal/livetable/LiveTableLiveDataPropertyStore.java b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-livetable/src/main/java/org/xwiki/livedata/internal/livetable/LiveTableLiveDataPropertyStore.java
@@ -191,16 +191,16 @@ private LiveDataPropertyDescriptor getLiveDataPropertyDescriptor(PropertyClass x
         descriptor.setDescription(xproperty.getHint());
         descriptor.setType(xproperty.getClassType());
         // List properties are sortable by default, but only if they have single selection.
-        if (xproperty instanceof ListClass && ((ListClass) xproperty).isMultiSelect()) {
+        if (xproperty instanceof ListClass listClass && listClass.isMultiSelect()) {
             descriptor.setSortable(false);
         }
         // The returned property value is the displayer output.
         descriptor.setDisplayer(new DisplayerDescriptor("xObjectProperty"));
         if (xproperty instanceof ListClass) {
             FilterDescriptor filterList = new FilterDescriptor("list");
-            if (xproperty instanceof LevelsClass) {
+            if (xproperty instanceof LevelsClass levelsClass) {
                 // We need to provide a list of maps of value / labels so that selectize can interpret them.
-                filterList.setParameter("options", ((LevelsClass) xproperty).getList(xcontext)
+                filterList.setParameter("options", levelsClass.getList(xcontext)
                     .stream()
                     .map(item -> Map.of(
                         "value", item,
@@ -219,8 +219,8 @@ private LiveDataPropertyDescriptor getLiveDataPropertyDescriptor(PropertyClass x
                 filterList.setDefaultOperator(EQUALS_OPERATOR);
             }
             descriptor.setFilter(filterList);
-        } else if (xproperty instanceof DateClass) {
-            String dateFormat = ((DateClass) xproperty).getDateFormat();
+        } else if (xproperty instanceof DateClass dateClass) {
+            String dateFormat = dateClass.getDateFormat();
             if (!StringUtils.isEmpty(dateFormat)) {
                 descriptor.setFilter(new FilterDescriptor("date"));
                 descriptor.getFilter().setParameter("dateFormat", dateFormat);
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-livetable/src/main/java/org/xwiki/livedata/internal/livetable/LiveTableLiveDataSource.java b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-livetable/src/main/java/org/xwiki/livedata/internal/livetable/LiveTableLiveDataSource.java
@@ -52,17 +52,17 @@ public class LiveTableLiveDataSource extends WithParameters implements LiveDataS
     @Override
     public LiveDataEntryStore getEntries()
     {
-        if (this.entryStore instanceof WithParameters) {
-            ((WithParameters) this.entryStore).getParameters().putAll(this.getParameters());
+        if (this.entryStore instanceof WithParameters withParameters) {
+            withParameters.getParameters().putAll(this.getParameters());
         }
         return this.entryStore;
     }
 
     @Override
     public LiveDataPropertyDescriptorStore getProperties()
     {
-        if (this.propertyStore instanceof WithParameters) {
-            ((WithParameters) this.propertyStore).getParameters().putAll(this.getParameters());
+        if (this.propertyStore instanceof WithParameters withParameters) {
+            withParameters.getParameters().putAll(this.getParameters());
         }
         return this.propertyStore;
     }
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-livetable/src/main/java/org/xwiki/livedata/internal/livetable/LiveTableResultsURLDocumentReferenceResolver.java b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-livetable/src/main/java/org/xwiki/livedata/internal/livetable/LiveTableResultsURLDocumentReferenceResolver.java
@@ -85,8 +85,8 @@ public String resolve(String liveTableResultsURL)
             ExtendedURL extendedURL = new ExtendedURL(url, xcontext.getRequest().getContextPath());
             ResourceType type = this.typeResolver.resolve(extendedURL, Collections.emptyMap());
             ResourceReference reference = this.resourceResolver.resolve(extendedURL, type, Collections.emptyMap());
-            if (reference instanceof EntityResourceReference) {
-                EntityReference entityReference = ((EntityResourceReference) reference).getEntityReference();
+            if (reference instanceof EntityResourceReference entityResourceReference) {
+                EntityReference entityReference = entityResourceReference.getEntityReference();
                 DocumentReference documentReference =
                     this.currentEntityDocumentReferenceResolver.resolve(entityReference);
                 return this.defaultEntityReferenceSerializer.serialize(documentReference);
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-livetable/src/main/java/org/xwiki/livedata/internal/livetable/PropertyTypeSupplier.java b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-livetable/src/main/java/org/xwiki/livedata/internal/livetable/PropertyTypeSupplier.java
@@ -69,8 +69,8 @@ public String getPropertyType(String propertyName, String className)
         try {
             XWikiDocument classDocument = xcontext.getWiki().getDocument(classReference, xcontext);
             PropertyInterface property = classDocument.getXClass().get(propertyName);
-            if (property instanceof PropertyClass) {
-                return ((PropertyClass) property).getClassType();
+            if (property instanceof PropertyClass propertyClass) {
+                return propertyClass.getClassType();
             }
         } catch (XWikiException e) {
             this.logger.warn("Failed to read the type of property [{}] from [{}]. Root cause is [{}].", propertyName,
diff --git a/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/main/java/org/xwiki/model/internal/reference/AbstractEntityReferenceResolver.java b/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/main/java/org/xwiki/model/internal/reference/AbstractEntityReferenceResolver.java
@@ -91,13 +91,11 @@ protected EntityReference resolveDefaultReference(EntityType type, Object... par
     {
         EntityReference resolvedDefaultValue = null;
 
-        if (parameters != null && parameters.length > 0 && parameters[0] instanceof EntityReference) {
-            // Try to extract the required type from the passed parameter.
-            EntityReference referenceParameter = (EntityReference) parameters[0];
+        if (parameters != null && parameters.length > 0 && parameters[0] instanceof EntityReference reference) {
             // Make sure to use a compatible reference
-            referenceParameter = toCompatibleEntityReference(referenceParameter, type);
+            reference = toCompatibleEntityReference(reference, type);
 
-            EntityReference extractedReference = referenceParameter.extractReference(type);
+            EntityReference extractedReference = reference.extractReference(type);
             if (extractedReference != null) {
                 resolvedDefaultValue = extractedReference;
 
diff --git a/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/main/java/org/xwiki/model/internal/reference/DefaultReferenceAttachmentReferenceResolver.java b/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/main/java/org/xwiki/model/internal/reference/DefaultReferenceAttachmentReferenceResolver.java
@@ -52,8 +52,8 @@ public class DefaultReferenceAttachmentReferenceResolver implements AttachmentRe
     @Override
     public AttachmentReference resolve(EntityReference attachmentReferenceRepresentation, Object... parameters)
     {
-        if (attachmentReferenceRepresentation instanceof AttachmentReference) {
-            return (AttachmentReference) attachmentReferenceRepresentation;
+        if (attachmentReferenceRepresentation instanceof AttachmentReference attachmentReference) {
+            return attachmentReference;
         }
 
         return new AttachmentReference(this.entityReferenceResolver.resolve(attachmentReferenceRepresentation,
diff --git a/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/main/java/org/xwiki/model/internal/reference/DefaultReferenceDocumentReferenceResolver.java b/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/main/java/org/xwiki/model/internal/reference/DefaultReferenceDocumentReferenceResolver.java
@@ -52,8 +52,8 @@ public class DefaultReferenceDocumentReferenceResolver implements DocumentRefere
     @Override
     public DocumentReference resolve(EntityReference documentReferenceRepresentation, Object... parameters)
     {
-        if (documentReferenceRepresentation instanceof DocumentReference) {
-            return (DocumentReference) documentReferenceRepresentation;
+        if (documentReferenceRepresentation instanceof DocumentReference documentReference) {
+            return documentReference;
         }
 
         return new DocumentReference(this.entityReferenceResolver.resolve(documentReferenceRepresentation,
diff --git a/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/main/java/org/xwiki/model/internal/reference/DefaultReferencePageAttachmentReferenceResolver.java b/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/main/java/org/xwiki/model/internal/reference/DefaultReferencePageAttachmentReferenceResolver.java
@@ -52,8 +52,8 @@ public class DefaultReferencePageAttachmentReferenceResolver implements PageAtta
     @Override
     public PageAttachmentReference resolve(EntityReference attachmentReferenceRepresentation, Object... parameters)
     {
-        if (attachmentReferenceRepresentation instanceof PageAttachmentReference) {
-            return (PageAttachmentReference) attachmentReferenceRepresentation;
+        if (attachmentReferenceRepresentation instanceof PageAttachmentReference pageAttachmentReference) {
+            return pageAttachmentReference;
         }
 
         return new PageAttachmentReference(this.entityReferenceResolver.resolve(attachmentReferenceRepresentation,
diff --git a/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/main/java/org/xwiki/model/internal/reference/DefaultReferencePageReferenceResolver.java b/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/main/java/org/xwiki/model/internal/reference/DefaultReferencePageReferenceResolver.java
@@ -52,8 +52,8 @@ public class DefaultReferencePageReferenceResolver implements PageReferenceResol
     @Override
     public PageReference resolve(EntityReference pageReferenceRepresentation, Object... parameters)
     {
-        if (pageReferenceRepresentation instanceof PageReference) {
-            return (PageReference) pageReferenceRepresentation;
+        if (pageReferenceRepresentation instanceof PageReference pageReference) {
+            return pageReference;
         }
 
         return new PageReference(
diff --git a/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/main/java/org/xwiki/model/internal/reference/DefaultReferenceSpaceReferenceResolver.java b/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/main/java/org/xwiki/model/internal/reference/DefaultReferenceSpaceReferenceResolver.java
@@ -51,8 +51,8 @@ public class DefaultReferenceSpaceReferenceResolver implements SpaceReferenceRes
     @Override
     public SpaceReference resolve(EntityReference spaceReferenceRepresentation, Object... parameters)
     {
-        if (spaceReferenceRepresentation instanceof SpaceReference) {
-            return (SpaceReference) spaceReferenceRepresentation;
+        if (spaceReferenceRepresentation instanceof SpaceReference spaceReference) {
+            return spaceReference;
         }
 
         return new SpaceReference(this.entityReferenceResolver.resolve(spaceReferenceRepresentation, EntityType.SPACE,
diff --git a/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/main/java/org/xwiki/model/internal/reference/DefaultWikiReferenceProvider.java b/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/main/java/org/xwiki/model/internal/reference/DefaultWikiReferenceProvider.java
@@ -58,7 +58,7 @@ public WikiReference get()
             EntityReference reference = this.provider.getDefaultReference(EntityType.WIKI);
 
             this.cachedReference = this.factory.getReference(
-                reference instanceof WikiReference ? (WikiReference) reference : new WikiReference(reference));
+                reference instanceof WikiReference wikiReference ? wikiReference : new WikiReference(reference));
         }
 
         return this.cachedReference;
diff --git a/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/main/java/org/xwiki/model/internal/reference/LocalUidStringEntityReferenceSerializer.java b/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/main/java/org/xwiki/model/internal/reference/LocalUidStringEntityReferenceSerializer.java
@@ -113,8 +113,8 @@ protected void serializeEntityReference(EntityReference currentReference, String
         representation.append(name.length()).append(':').append(name);
 
         // Append Locale
-        if (currentReference instanceof DocumentReference) {
-            Locale locale = ((DocumentReference) currentReference).getLocale();
+        if (currentReference instanceof DocumentReference documentReference) {
+            Locale locale = documentReference.getLocale();
             if (locale != null) {
                 String localeString = locale.toString();
                 if (!localeString.isEmpty()) {
diff --git a/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/main/java/org/xwiki/model/internal/reference/LocalizedStringEntityReferenceSerializer.java b/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/main/java/org/xwiki/model/internal/reference/LocalizedStringEntityReferenceSerializer.java
@@ -55,13 +55,11 @@ protected void serializeEntityReference(EntityReference currentReference, String
         super.serializeEntityReference(currentReference, representation, isLastReference, parameters);
 
         // Append parameters for DocumentReference (if any)
-        if (currentReference instanceof DocumentReference) {
-            DocumentReference documentReference = (DocumentReference) currentReference;
+        if (currentReference instanceof DocumentReference documentReference) {
             if (documentReference.getLocale() != null) {
                 representation.append('(').append(documentReference.getLocale()).append(')');
             }
-        } else if (currentReference instanceof LocalDocumentReference) {
-            LocalDocumentReference documentReference = (LocalDocumentReference) currentReference;
+        } else if (currentReference instanceof LocalDocumentReference documentReference) {
             if (documentReference.getLocale() != null) {
                 representation.append('(').append(documentReference.getLocale()).append(')');
             }
diff --git a/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/main/java/org/xwiki/model/internal/reference/UidStringEntityReferenceSerializer.java b/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/main/java/org/xwiki/model/internal/reference/UidStringEntityReferenceSerializer.java
@@ -57,8 +57,8 @@ protected void serializeEntityReference(EntityReference currentReference, String
         representation.append(name.length()).append(':').append(name);
 
         // Append Locale
-        if (currentReference instanceof AbstractLocalizedEntityReference) {
-            Locale locale = ((AbstractLocalizedEntityReference) currentReference).getLocale();
+        if (currentReference instanceof AbstractLocalizedEntityReference reference) {
+            Locale locale = reference.getLocale();
             if (locale != null) {
                 String localeString = locale.toString();
                 representation.append(localeString.length()).append(":").append(localeString);
diff --git a/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/main/java/org/xwiki/model/reference/AttachmentReferenceConverter.java b/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/main/java/org/xwiki/model/reference/AttachmentReferenceConverter.java
@@ -62,8 +62,8 @@ protected AttachmentReference convertToType(Type type, Object value)
 
         AttachmentReference reference;
 
-        if (value instanceof EntityReference) {
-            reference = this.referenceResolver.resolve((EntityReference) value);
+        if (value instanceof EntityReference entityReference) {
+            reference = this.referenceResolver.resolve(entityReference);
         } else {
             reference = this.stringResolver.resolve(value.toString());
         }
diff --git a/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/main/java/org/xwiki/model/reference/DocumentReference.java b/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/main/java/org/xwiki/model/reference/DocumentReference.java
@@ -394,12 +394,12 @@ public static Optional<DocumentReference> extractDocument(EntityReference entity
     {
         Optional<DocumentReference> result = Optional.empty();
         if (entityReference != null) {
-            if (entityReference instanceof DocumentReference) {
-                result = Optional.of((DocumentReference) entityReference);
+            if (entityReference instanceof DocumentReference documentReference) {
+                result = Optional.of(documentReference);
             } else {
                 EntityReference extractedRef = entityReference.extractReference(EntityType.DOCUMENT);
-                if (extractedRef instanceof DocumentReference) {
-                    result = Optional.of((DocumentReference) extractedRef);
+                if (extractedRef instanceof DocumentReference documentReference) {
+                    result = Optional.of(documentReference);
                 } else if (extractedRef != null) {
                     result = Optional.of(new DocumentReference(extractedRef));
                 }
diff --git a/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/main/java/org/xwiki/model/reference/EntityReference.java b/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/main/java/org/xwiki/model/reference/EntityReference.java
diff --git a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-default/src/main/java/org/xwiki/user/internal/document/AbstractDocumentStringUserReferenceResolver.java b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-default/src/main/java/org/xwiki/user/internal/document/AbstractDocumentStringUserReferenceResolver.java
diff --git a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-default/src/main/java/org/xwiki/user/internal/document/DocumentStringUserReferenceSerializer.java b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-default/src/main/java/org/xwiki/user/internal/document/DocumentStringUserReferenceSerializer.java
diff --git a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-default/src/main/java/org/xwiki/user/internal/group/DefaultGroupManager.java b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-default/src/main/java/org/xwiki/user/internal/group/DefaultGroupManager.java
diff --git a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-default/src/main/java/org/xwiki/user/internal/group/GroupCacheInvalidationListener.java b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-default/src/main/java/org/xwiki/user/internal/group/GroupCacheInvalidationListener.java
diff --git a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-default/src/main/java/org/xwiki/user/internal/group/UsersCacheInvalidationListener.java b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-default/src/main/java/org/xwiki/user/internal/group/UsersCacheInvalidationListener.java

Original file line number	Diff line number	Diff line change
`@@ -50,8 +50,7 @@ public DocumentColorThemeReference(DocumentReference colorThemeDocument,`
`50`	`50`	`@Override`
`51`	`51`	`public boolean equals(Object o)`
`52`	`52`	`{`
`53`		`- if (o instanceof DocumentColorThemeReference) {`
`54`		`- DocumentColorThemeReference documentSkinReference = (DocumentColorThemeReference) o;`
	`53`	`+ if (o instanceof DocumentColorThemeReference documentSkinReference) {`
`55`	`54`	`return colorThemeDocument.equals(documentSkinReference.colorThemeDocument);`
`56`	`55`	`}`
`57`	`56`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,7 @@ public NamedColorThemeReference(String colorThemeName)`
`42`	`42`	`@Override`
`43`	`43`	`public boolean equals(Object o)`
`44`	`44`	`{`
`45`		`- if (o instanceof NamedColorThemeReference) {`
`46`		`- NamedColorThemeReference namedColorThemeReference = (NamedColorThemeReference) o;`
	`45`	`+ if (o instanceof NamedColorThemeReference namedColorThemeReference) {`
`47`	`46`	`return colorThemeName.equals(namedColorThemeReference.colorThemeName);`
`48`	`47`	`}`
`49`	`48`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -64,9 +64,7 @@ public LESSObjectPropertyResourceReference(ObjectPropertyReference objectPropert`
`64`	`64`	`@Override`
`65`	`65`	`public boolean equals(Object o)`
`66`	`66`	`{`
`67`		`- if (o instanceof LESSObjectPropertyResourceReference) {`
`68`		`- LESSObjectPropertyResourceReference lessObjectPropertyResourceReference =`
`69`		`- (LESSObjectPropertyResourceReference) o;`
	`67`	`+ if (o instanceof LESSObjectPropertyResourceReference lessObjectPropertyResourceReference) {`
`70`	`68`	`return objectPropertyReference.equals(lessObjectPropertyResourceReference.objectPropertyReference);`
`71`	`69`	`}`
`72`	`70`
Original file line number	Diff line number	Diff line change
`@@ -55,8 +55,8 @@ public LESSSkinFileResourceReference(String fileName, TemplateManager templateMa`
`55`	`55`	`@Override`
`56`	`56`	`public boolean equals(Object o)`
`57`	`57`	`{`
`58`		`- if (o instanceof LESSSkinFileResourceReference) {`
`59`		`- return fileName.equals(((LESSSkinFileResourceReference) o).fileName);`
	`58`	`+ if (o instanceof LESSSkinFileResourceReference lessSkinFileResourceReference) {`
	`59`	`+ return fileName.equals(lessSkinFileResourceReference.fileName);`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -57,8 +57,7 @@ public DocumentReference getSkinDocument()`
`57`	`57`	`@Override`
`58`	`58`	`public boolean equals(Object o)`
`59`	`59`	`{`
`60`		`- if (o instanceof DocumentSkinReference) {`
`61`		`- DocumentSkinReference documentSkinReference = (DocumentSkinReference) o;`
	`60`	`+ if (o instanceof DocumentSkinReference documentSkinReference) {`
`62`	`61`	`return skinDocument.equals(documentSkinReference.skinDocument);`
`63`	`62`	`}`
`64`	`63`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,7 @@ public String getSkinName()`
`49`	`49`	`@Override`
`50`	`50`	`public boolean equals(Object o)`
`51`	`51`	`{`
`52`		`- if (o instanceof FSSkinReference) {`
`53`		`- FSSkinReference fsSkinReference = (FSSkinReference) o;`
	`52`	`+ if (o instanceof FSSkinReference fsSkinReference) {`
`54`	`53`	`return skinName.equals(fsSkinReference.skinName);`
`55`	`54`	`}`
`56`	`55`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -114,8 +114,8 @@ protected LiveDataConfiguration getDefaultConfiguration(LiveDataConfiguration co`
`114`	`114`	`private LiveDataPropertyDescriptorStore getPropertyStore(Source sourceConfig)`
`115`	`115`	`{`
`116`	`116`	`LiveDataPropertyDescriptorStore propertyStore = this.propertyStoreProvider.get();`
`117`		`- if (propertyStore instanceof WithParameters && sourceConfig != null) {`
`118`		`- ((WithParameters) propertyStore).getParameters().putAll(sourceConfig.getParameters());`
	`117`	`+ if (propertyStore instanceof WithParameters withParameters && sourceConfig != null) {`
	`118`	`+ withParameters.getParameters().putAll(sourceConfig.getParameters());`
`119`	`119`	`}`
`120`	`120`	`return propertyStore;`
`121`	`121`	`}`