Merge remote-tracking branch 'origin/main'

Author: thkwag

simplix-auth/src/main/java/dev/simplecore/simplix/auth/autoconfigure/SimpliXAuthSecurityConfiguration.java

@@ -219,7 +219,7 @@ public SecurityFilterChain webSecurityFilterChain(
                 }
                 String permissions = properties.getSecurity().getPermissionsPolicy();
                 if (permissions != null && !permissions.isEmpty()) {
-                    headers.permissionsPolicy(pp -> pp.policy(permissions));
+                    headers.permissionsPolicyHeader(pp -> pp.policy(permissions));
                 }
             });
 

simplix-file/src/main/java/dev/simplecore/simplix/file/config/ImageProperties.java

@@ -52,6 +52,13 @@ public class ImageProperties {
      */
     private int defaultQuality = 85;
 
+    /**
+     * Whether to downscale images that exceed the configured maximum dimensions
+     * at upload time. When false, the original is stored losslessly and only
+     * derived thumbnails are resized on demand.
+     */
+    private boolean resizeOnUpload = true;
+
     /**
      * Maximum file size for images
      */

simplix-file/src/main/java/dev/simplecore/simplix/file/infrastructure/image/impl/AwtImageProcessingService.java

@@ -150,44 +150,32 @@ public ProcessedImage generateThumbnail(InputStream input, int width, int height
                 );
             }
 
-            // Calculate crop dimensions to center-crop to target aspect ratio
             int originalWidth = image.getWidth();
             int originalHeight = image.getHeight();
 
-            double targetRatio = (double) width / height;
-            double originalRatio = (double) originalWidth / originalHeight;
-
-            int cropWidth;
-            int cropHeight;
-            int cropX;
-            int cropY;
-
-            if (originalRatio > targetRatio) {
-                // Original is wider, crop sides
-                cropHeight = originalHeight;
-                cropWidth = (int) (originalHeight * targetRatio);
-                cropX = (originalWidth - cropWidth) / 2;
-                cropY = 0;
-            } else {
-                // Original is taller, crop top/bottom
-                cropWidth = originalWidth;
-                cropHeight = (int) (originalWidth / targetRatio);
-                cropX = 0;
-                cropY = (originalHeight - cropHeight) / 2;
+            // Fit the whole image inside the width x height bounding box, preserving
+            // aspect ratio (no cropping). The box is treated as a maximum; the output
+            // dimensions vary so the entire image stays visible (object-contain).
+            // Never upscale beyond the original size.
+            double scale = Math.min((double) width / originalWidth, (double) height / originalHeight);
+            if (scale > 1.0) {
+                scale = 1.0;
             }
 
-            // Crop to target aspect ratio
-            BufferedImage cropped = image.getSubimage(cropX, cropY, cropWidth, cropHeight);
+            int targetWidth = Math.max(1, (int) Math.round(originalWidth * scale));
+            int targetHeight = Math.max(1, (int) Math.round(originalHeight * scale));
 
-            // Resize to target dimensions
-            BufferedImage thumbnail = resizeImage(cropped, width, height);
+            // Resize to the fitted dimensions (resizeImage fully covers the canvas, so
+            // no padding is baked in — letterboxing is handled by the display CSS).
+            BufferedImage thumbnail = resizeImage(image, targetWidth, targetHeight);
 
             int quality = imageProperties.getThumbnail().getDefaultQuality();
             byte[] resultBytes = writeImage(thumbnail, "jpg", quality);
 
-            log.debug("Generated thumbnail {}x{} from {}x{}", width, height, originalWidth, originalHeight);
+            log.debug("Generated thumbnail {}x{} (box {}x{}) from {}x{}",
+                targetWidth, targetHeight, width, height, originalWidth, originalHeight);
 
-            return new ProcessedImage(resultBytes, "image/jpeg", width, height);
+            return new ProcessedImage(resultBytes, "image/jpeg", targetWidth, targetHeight);
         } catch (IOException e) {
             throw new ImageProcessingException(
                 ImageProcessingException.ImageErrorCode.THUMBNAIL_GENERATION_FAILED,

simplix-file/src/main/java/dev/simplecore/simplix/file/infrastructure/upload/impl/DefaultFileProcessingService.java

@@ -171,7 +171,8 @@ private ProcessedFileResult processImage(FileProcessingRequest request) {
                     metadata.width(), metadata.height(), finalWidth, finalHeight,
                     optimized.data().length);
 
-            } else if (metadata.width() > maxWidth || metadata.height() > maxHeight) {
+            } else if (imageProperties.isResizeOnUpload()
+                && (metadata.width() > maxWidth || metadata.height() > maxHeight)) {
                 // Only resize without WebP conversion
                 ProcessedImage resized = imageProcessingService.resizeIfExceeds(
                     file.getInputStream(), maxWidth, maxHeight

simplix-hibernate/src/main/java/dev/simplecore/simplix/hibernate/event/EntityEventPublishingListener.java

@@ -20,6 +20,7 @@
 import org.slf4j.MDC;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.orm.jpa.EntityManagerFactoryUtils;
 import org.springframework.stereotype.Component;
 
@@ -156,7 +157,9 @@ private boolean shouldPublish(Object entity) {
     }
 
     private EntityEventConfig getConfig(Object entity) {
-        return entity.getClass().getAnnotation(EntityEventConfig.class);
+        // Use Spring AnnotationUtils to traverse @MappedSuperclass / interface hierarchy.
+        // A subclass-level @EntityEventConfig still takes precedence (direct annotation first).
+        return AnnotationUtils.findAnnotation(entity.getClass(), EntityEventConfig.class);
     }
 
     private void publishEvent(String eventType, Object entity, Set<String> changedProperties,