diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/SimpleImageDataConfig.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/SimpleImageDataConfig.java index d866e4ad55e3ba70906ebdbc4ec07975b7447c5e..652d701eb6549b1fb41bdafb3f6329565002e4ad 100644 --- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/SimpleImageDataConfig.java +++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/SimpleImageDataConfig.java @@ -20,7 +20,7 @@ import java.util.List; import ch.systemsx.cisd.base.image.IImageTransformerFactory; import ch.systemsx.cisd.common.shared.basic.utils.StringUtils; -import ch.systemsx.cisd.openbis.dss.etl.biozentrum.ConvertToolImageTransformerFactory; +import ch.systemsx.cisd.openbis.dss.etl.dto.api.v1.transformations.ConvertToolImageTransformerFactory; import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.Geometry; import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.ScreeningConstants; diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/biozentrum/ConvertToolImageTransformer.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/ConvertToolImageTransformer.java similarity index 94% rename from screening/source/java/ch/systemsx/cisd/openbis/dss/etl/biozentrum/ConvertToolImageTransformer.java rename to screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/ConvertToolImageTransformer.java index 13c8788752a355382acacc1ad3bfe5702f835298..2e2f06ab6ca89ce0a86f45802e83bff24ee5f65e 100644 --- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/biozentrum/ConvertToolImageTransformer.java +++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/ConvertToolImageTransformer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ch.systemsx.cisd.openbis.dss.etl.biozentrum; +package ch.systemsx.cisd.openbis.dss.etl.dto.api.v1.transformations; import java.awt.image.BufferedImage; import java.io.BufferedReader; @@ -50,6 +50,9 @@ import ch.systemsx.cisd.imagereaders.ImageReaderFactory; /** * An {@link IImageTransformer} using the convert command line tool for transformations. + * <p> + * Warning: The serialized version of this class can be stored in the database for each image. + * Moving this class to a different package would make all the saved transformations invalid. * * @author Kaloyan Enimanev */ @@ -113,7 +116,7 @@ public class ConvertToolImageTransformer implements IImageTransformer final ByteArrayOutputStream bos = new ByteArrayOutputStream(); final List<String> errorLines = new ArrayList<String>(); ProcessIOStrategy customIOStrategy = createCustomProcessIOStrategy(input, bos, errorLines); - + ProcessResult result = ProcessExecutionHelper.run(getCommandLine(), operationLog, machineLog, ConcurrencyUtilities.NO_TIMEOUT, customIOStrategy, false); @@ -137,9 +140,9 @@ public class ConvertToolImageTransformer implements IImageTransformer { return ProcessIOStrategy.createCustom(new IProcessIOHandler() { - - public void handle(AtomicBoolean processRunning, OutputStream stdin, InputStream stdout, - InputStream stderr) throws IOException + + public void handle(AtomicBoolean processRunning, OutputStream stdin, + InputStream stdout, InputStream stderr) throws IOException { stdin.write(input); stdin.flush(); diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/biozentrum/ConvertToolImageTransformerFactory.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/ConvertToolImageTransformerFactory.java similarity index 95% rename from screening/source/java/ch/systemsx/cisd/openbis/dss/etl/biozentrum/ConvertToolImageTransformerFactory.java rename to screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/ConvertToolImageTransformerFactory.java index 8c2591ee481bbfd32f26c726ed8d4699f0862a95..8bcfeebb62b69ef9fe9bb1120bc92881f2473030 100644 --- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/biozentrum/ConvertToolImageTransformerFactory.java +++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/ConvertToolImageTransformerFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ch.systemsx.cisd.openbis.dss.etl.biozentrum; +package ch.systemsx.cisd.openbis.dss.etl.dto.api.v1.transformations; import ch.systemsx.cisd.base.image.IImageTransformer; import ch.systemsx.cisd.base.image.IImageTransformerFactory; diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/biozentrum/ConvertToolImageTransformerTest.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/ConvertToolImageTransformerTest.java similarity index 93% rename from screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/biozentrum/ConvertToolImageTransformerTest.java rename to screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/ConvertToolImageTransformerTest.java index 17a195b270dd76e265c88815bb882936d4a0db1c..2ad39708e839be4f62e69a52dea90c16d4c2b9d9 100644 --- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/biozentrum/ConvertToolImageTransformerTest.java +++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/ConvertToolImageTransformerTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ch.systemsx.cisd.openbis.dss.etl.biozentrum; +package ch.systemsx.cisd.openbis.dss.etl.dto.api.v1.transformations; import java.awt.image.BufferedImage; import java.io.File; @@ -23,6 +23,7 @@ import org.testng.AssertJUnit; import org.testng.annotations.Test; import ch.systemsx.cisd.base.image.IImageTransformer; +import ch.systemsx.cisd.openbis.dss.etl.dto.api.v1.transformations.ConvertToolImageTransformerFactory; import ch.systemsx.cisd.openbis.dss.generic.shared.utils.ImageUtil; /**