From e928ff3bb6c376f99441e50ecb534411f43eb531 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Tue, 20 Dec 2011 10:02:48 +0000
Subject: [PATCH] LMS-2623 file type set to null
SVN: 24056
---
.../openbis/dss/etl/ImageSizeFeedingMaintenanceTask.java | 9 +--------
.../dss/etl/ImageSizeFeedingMaintenanceTaskTest.java | 8 ++++----
2 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/ImageSizeFeedingMaintenanceTask.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/ImageSizeFeedingMaintenanceTask.java
index 559995f4bd0..f46add68789 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/ImageSizeFeedingMaintenanceTask.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/ImageSizeFeedingMaintenanceTask.java
@@ -186,15 +186,8 @@ public class ImageSizeFeedingMaintenanceTask implements IDataStoreLockingMainten
BufferedImage unchangedImage = image.getUnchangedImage();
int width = unchangedImage.getWidth();
int height = unchangedImage.getHeight();
- String fileType = null;
- String uniqueId = image.getUniqueId();
- int lastIndexOfDot = uniqueId.lastIndexOf('.');
- if (lastIndexOfDot >= 0)
- {
- fileType = uniqueId.substring(lastIndexOfDot + 1);
- }
dao.addImageZoomLevel(new ImgImageZoomLevelDTO(dataSetCode, original, "", width, height,
- null, fileType, dataSetId));
+ null, null, dataSetId));
return (original ? "Original" : "Thumbnail") + " size " + width + "x" + height
+ " added for data set " + dataSetCode;
}
diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/ImageSizeFeedingMaintenanceTaskTest.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/ImageSizeFeedingMaintenanceTaskTest.java
index 8ba05b0416c..ed3a1849eef 100644
--- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/ImageSizeFeedingMaintenanceTaskTest.java
+++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/ImageSizeFeedingMaintenanceTaskTest.java
@@ -57,7 +57,7 @@ public class ImageSizeFeedingMaintenanceTaskTest extends AssertJUnit
public MockAbsoluteImageReference(int width, int height)
{
- super(null, "img.jpg", null, null, new RequestedImageSize(null, false), null,
+ super(null, null, null, null, new RequestedImageSize(null, false), null,
new ImageTransfomationFactories(), null);
this.width = width;
this.height = height;
@@ -193,9 +193,9 @@ public class ImageSizeFeedingMaintenanceTaskTest extends AssertJUnit
+ "1 original image sizes and 1 thumbnail image sizes are added to the database.",
logRecorder.getLogContent());
assertEquals("[ImgImageZoomLevelDTO{physicalDatasetPermId=ds2,isOriginal=true,"
- + "containerDatasetId=99715,rootPath=,width=144,height=89,colorDepth=<null>,fileType=jpg,id=0}, "
+ + "containerDatasetId=99715,rootPath=,width=144,height=89,colorDepth=<null>,fileType=<null>,id=0}, "
+ "ImgImageZoomLevelDTO{physicalDatasetPermId=ds3,isOriginal=false,"
- + "containerDatasetId=99716,rootPath=,width=21,height=34,colorDepth=<null>,fileType=jpg,id=0}]",
+ + "containerDatasetId=99716,rootPath=,width=21,height=34,colorDepth=<null>,fileType=<null>,id=0}]",
zoomLevels.toString());
context.assertIsSatisfied();
}
@@ -233,7 +233,7 @@ public class ImageSizeFeedingMaintenanceTaskTest extends AssertJUnit
"0 original image sizes and 0 thumbnail image sizes are added to the database.",
logRecorder.getLogContent());
assertEquals("[ImgImageZoomLevelDTO{physicalDatasetPermId=ds2,isOriginal=true,"
- + "containerDatasetId=99715,rootPath=,width=1,height=2,colorDepth=<null>,fileType=jpg,id=0}]",
+ + "containerDatasetId=99715,rootPath=,width=1,height=2,colorDepth=<null>,fileType=<null>,id=0}]",
zoomLevels.toString());
context.assertIsSatisfied();
}
--
GitLab