SSDM-2898 : Automatically created sample codes should form a continuous...

SSDM-2898 : Automatically created sample codes should form a continuous sequence - Temporary code generation.

SVN: 35373

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SampleCodeGeneratorInternal.java → openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SampleCodeGeneratorTemporal.java

@@ -17,15 +17,14 @@
 package ch.systemsx.cisd.openbis.generic.server.business.bo;
 
 import java.util.List;
+import java.util.UUID;
 
 import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityKind;
 
-public class SampleCodeGeneratorInternal extends EntityCodeGenerator
+public class SampleCodeGeneratorTemporal extends EntityCodeGenerator
 {
-    String transactionId;
-    
-    public SampleCodeGeneratorInternal(String transactionId, IDAOFactory daoFactory)
+    public SampleCodeGeneratorTemporal(IDAOFactory daoFactory)
     {
         super(daoFactory);
     }
@@ -33,7 +32,7 @@ public class SampleCodeGeneratorInternal extends EntityCodeGenerator
     @Override
     public List<String> generateCodes(String codePrefix, EntityKind entityKind, int numberOfCodes)
     {
-        return super.generateCodes("TEMP-" + transactionId + "-", entityKind, numberOfCodes);
+        return super.generateCodes("TEMP." + UUID.randomUUID().toString() + ".", entityKind, numberOfCodes);
     }
 
 }

openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientService.java

@@ -34,6 +34,7 @@ import org.springframework.stereotype.Component;
 
 import ch.rinn.restrictions.Private;
 import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
+import ch.systemsx.cisd.common.properties.PropertyUtils;
 import ch.systemsx.cisd.common.servlet.IRequestContextProvider;
 import ch.systemsx.cisd.openbis.common.spring.IUncheckedMultipartFile;
 import ch.systemsx.cisd.openbis.generic.client.web.client.dto.DataSetUpdates;
@@ -46,6 +47,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.server.queue.ConsumerQueue;
 import ch.systemsx.cisd.openbis.generic.client.web.server.queue.ConsumerTask;
 import ch.systemsx.cisd.openbis.generic.client.web.server.translator.UserFailureExceptionTranslator;
 import ch.systemsx.cisd.openbis.generic.server.dataaccess.db.exception.SampleUniqueCodeViolationExceptionAbstract;
+import ch.systemsx.cisd.openbis.generic.shared.Constants;
 import ch.systemsx.cisd.openbis.generic.shared.IServer;
 import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.AbstractExternalData;
@@ -475,8 +477,10 @@ public class GenericClientService extends AbstractClientService implements IGene
             final boolean allowExperiments, String excelSheetName, BatchOperationKind operationKind, String sessionToken)
     {
         boolean updateExisting = (operationKind == BatchOperationKind.UPDATE);
+        boolean isCreateContinuousSampleCodes =
+                PropertyUtils.getBoolean(this.getServiceProperties(), Constants.CREATE_CONTINUOUS_SAMPLES_CODES_KEY, false);
         SampleCodeGenerator sampleCodeGeneratorOrNull =
-                tryGetSampleCodeGenerator(isAutoGenerateCodes, sampleType.getGeneratedCodePrefix(), sessionToken);
+                tryGetSampleCodeGenerator(isAutoGenerateCodes, isCreateContinuousSampleCodes, sampleType.getGeneratedCodePrefix(), sessionToken);
         Collection<NamedInputStream> files = new ArrayList<NamedInputStream>(uploadedFiles.size());
         for (IUncheckedMultipartFile f : uploadedFiles.iterable())
         {
@@ -524,7 +528,7 @@ public class GenericClientService extends AbstractClientService implements IGene
     }
 
     private SampleCodeGenerator tryGetSampleCodeGenerator(boolean isAutoGenerateCodes,
-            final String codePrefix, final String sessionToken)
+            final boolean isCreateContinuousSampleCodes, final String codePrefix, final String sessionToken)
     {
         if (isAutoGenerateCodes)
         {
@@ -533,8 +537,16 @@ public class GenericClientService extends AbstractClientService implements IGene
                     @Override
                     public List<String> generateCodes(int size)
                     {
-                        return genericServer.generateCodes(sessionToken, codePrefix,
-                                EntityKind.SAMPLE, size);
+                        if (isCreateContinuousSampleCodes)
+                        {
+                            return genericServer.generateTemporalCodes(sessionToken, codePrefix,
+                                    EntityKind.SAMPLE, size);
+                        } else
+                        {
+                            return genericServer.generateCodes(sessionToken, codePrefix,
+                                    EntityKind.SAMPLE, size);
+                        }
+
                     }
                 };
         } else

openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServer.java

@@ -62,6 +62,7 @@ import ch.systemsx.cisd.openbis.generic.server.business.bo.EntityCodeGenerator;
 import ch.systemsx.cisd.openbis.generic.server.business.bo.IExperimentBO;
 import ch.systemsx.cisd.openbis.generic.server.business.bo.IProjectBO;
 import ch.systemsx.cisd.openbis.generic.server.business.bo.ISampleBO;
+import ch.systemsx.cisd.openbis.generic.server.business.bo.SampleCodeGeneratorTemporal;
 import ch.systemsx.cisd.openbis.generic.server.business.bo.samplelister.ISampleLister;
 import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory;
 import ch.systemsx.cisd.openbis.generic.server.plugin.IDataSetTypeSlaveServerPlugin;
@@ -758,6 +759,15 @@ public final class GenericServer extends AbstractServer<IGenericServer> implemen
         return new EntityCodeGenerator(getDAOFactory()).generateCodes(prefix, entityKind, number);
     }
 
+    @Override
+    @RolesAllowed(RoleWithHierarchy.SPACE_OBSERVER)
+    public List<String> generateTemporalCodes(String sessionToken, String prefix,
+            ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityKind entityKind, int number)
+    {
+        checkSession(sessionToken);
+        return new SampleCodeGeneratorTemporal(getDAOFactory()).generateCodes(prefix, entityKind, number);
+    }
+
     @Override
     @RolesAllowed(RoleWithHierarchy.SPACE_USER)
     @Capability("WRITE_EXPERIMENT_SAMPLE")

openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServerLogger.java

@@ -167,6 +167,14 @@ final class GenericServerLogger extends AbstractServerLogger implements IGeneric
         return null;
     }
 
+    @Override
+    public List<String> generateTemporalCodes(String sessionToken, String prefix, EntityKind entityKind, int number)
+    {
+        logAccess(sessionToken, "generate_temporal_codes", "PREFIX(%s) ENTITY_KIND(%s) NUMBER(%s)", prefix,
+                entityKind, number);
+        return null;
+    }
+
     @Override
     public ExperimentUpdateResult updateExperiment(String sessionToken, ExperimentUpdatesDTO updates)
     {
@@ -300,5 +308,4 @@ final class GenericServerLogger extends AbstractServerLogger implements IGeneric
 
         return materials.toString();
     }
-
 }

openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/shared/IGenericServer.java

@@ -201,6 +201,10 @@ public interface IGenericServer extends IServer
     public List<String> generateCodes(String sessionToken, String prefix, EntityKind entityKind,
             int number);
 
+    @Transactional
+    public List<String> generateTemporalCodes(String sessionToken, String prefix,
+            EntityKind entityKind, int number);
+
     /**
      * Saves changed experiment.
      */