updated dbms enum

src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DBEndpoint.java

@@ -23,7 +23,7 @@ import javax.validation.constraints.*;
 /**
  * DBEndpoint
  */
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:38:23.147+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-08T12:41:32.345+02:00")
 public class DBEndpoint   {
   @JsonProperty("ipAddress")
   private String ipAddress = null;

src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DBEndpoints.java

@@ -22,7 +22,7 @@ import javax.validation.constraints.*;
  * a list of the database endpoints  to issue the  workload
  */
 @ApiModel(description = "a list of the database endpoints  to issue the  workload")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:38:23.147+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-08T12:41:32.345+02:00")
 public class DBEndpoints extends java.util.ArrayList<DBEndpoint>  {
 
   @Override

src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DatabaseConfig.java

@@ -25,7 +25,7 @@ import javax.validation.constraints.*;
 /**
  * DatabaseConfig
  */
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:38:23.147+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-08T12:41:32.345+02:00")
 public class DatabaseConfig   {
   /**
    * Gets or Sets databaseBinding

src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DatabaseConfigProperty.java

@@ -23,7 +23,7 @@ import javax.validation.constraints.*;
 /**
  * DatabaseConfigProperty
  */
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:38:23.147+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-08T12:41:32.345+02:00")
 public class DatabaseConfigProperty   {
   @JsonProperty("name")
   private String name = null;

src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/Error.java

@@ -23,7 +23,7 @@ import javax.validation.constraints.*;
 /**
  * Error
  */
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:38:23.147+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-08T12:41:32.345+02:00")
 public class Error   {
   @JsonProperty("code")
   private Integer code = null;

src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/MeasurementConfig.java

@@ -24,7 +24,7 @@ import javax.validation.constraints.*;
 /**
  * MeasurementConfig
  */
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:38:23.147+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-08T12:41:32.345+02:00")
 public class MeasurementConfig   {
   @JsonProperty("interval")
   private Integer interval = null;

src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TPCCWorkload.java

@@ -25,7 +25,7 @@ import javax.validation.constraints.*;
 /**
  * TPCCWorkload
  */
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:38:23.147+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-08T12:41:32.345+02:00")
 public class TPCCWorkload   {
   @JsonProperty("dbEndpoints")
   private DBEndpoints dbEndpoints = null;

src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TPCCWorkloadConfig.java

@@ -23,7 +23,7 @@ import javax.validation.constraints.*;
 /**
  * TPCCWorkloadConfig
  */
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:38:23.147+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-08T12:41:32.345+02:00")
 public class TPCCWorkloadConfig   {
   @JsonProperty("activeWarehouses")
   private Integer activeWarehouses = null;

src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSBSDataGeneration.java

@@ -25,7 +25,7 @@ import javax.validation.constraints.*;
  * parameters for the data generation phase
  */
 @ApiModel(description = "parameters for the data generation phase")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:38:23.147+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-08T12:41:32.345+02:00")
 public class TSBSDataGeneration   {
   @JsonProperty("usecase")
   private String usecase = null;

src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSBSLoadExecution.java

@@ -25,7 +25,7 @@ import javax.validation.constraints.*;
 /**
  * TSBSLoadExecution
  */
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:38:23.147+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-08T12:41:32.345+02:00")
 public class TSBSLoadExecution   {
   @JsonProperty("workers")
   private BigDecimal workers = null;

src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSBSQueryExecution.java

@@ -25,7 +25,7 @@ import javax.validation.constraints.*;
 /**
  * TSBSQueryExecution
  */
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:38:23.147+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-08T12:41:32.345+02:00")
 public class TSBSQueryExecution   {
   @JsonProperty("workers")
   private BigDecimal workers = null;

src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSBSQueryGeneration.java

@@ -25,7 +25,7 @@ import javax.validation.constraints.*;
  * parameters for the query generation phase
  */
 @ApiModel(description = "parameters for the query generation phase")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:38:23.147+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-08T12:41:32.345+02:00")
 public class TSBSQueryGeneration   {
   @JsonProperty("usecase")
   private String usecase = null;

src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSBSWorkload.java

@@ -29,7 +29,7 @@ import javax.validation.constraints.*;
 /**
  * TSBSWorkload
  */
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:38:23.147+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-08T12:41:32.345+02:00")
 public class TSBSWorkload   {
   @JsonProperty("dbEndpoints")
   private DBEndpoints dbEndpoints = null;
@@ -38,13 +38,13 @@ public class TSBSWorkload   {
    * specifies the data format for the selected DBMS
    */
   public enum DbmsEnum {
-    INFLUX("influx"),
+    INFLUX("INFLUX"),
     
-    TIMESCALEDB("timescaledb"),
+    TIMESALEDB("TIMESALEDB"),
     
-    MONGODB("mongodb"),
+    MONGODB("MONGODB"),
     
-    CASSANDRA("cassandra");
+    CASSANDRA("CASSANDRA");
 
     private String value;
 

src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSDBMSDBMSProperties.java

@@ -23,7 +23,7 @@ import javax.validation.constraints.*;
 /**
  * TSDBMSDBMSProperties
  */
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:38:23.147+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-08T12:41:32.345+02:00")
 public class TSDBMSDBMSProperties   {
   @JsonProperty("name")
   private String name = null;

src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/WorkloadConfig.java

@@ -24,7 +24,7 @@ import javax.validation.constraints.*;
 /**
  * WorkloadConfig
  */
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:38:23.147+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-08T12:41:32.345+02:00")
 public class WorkloadConfig   {
   /**
    * Gets or Sets workloadType

src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/WorkloadProcessInstance.java

@@ -25,7 +25,7 @@ import javax.validation.constraints.*;
 /**
  * WorkloadProcessInstance
  */
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:38:23.147+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-08T12:41:32.345+02:00")
 public class WorkloadProcessInstance   {
   @JsonProperty("processId")
   private String processId = null;

src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/WorkloadProcessSubmissionError.java

@@ -23,7 +23,7 @@ import javax.validation.constraints.*;
 /**
  * WorkloadProcessSubmissionError
  */
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:38:23.147+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-08T12:41:32.345+02:00")
 public class WorkloadProcessSubmissionError   {
   @JsonProperty("message")
   private String message = null;

src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/YCSBWorkload.java

@@ -27,7 +27,7 @@ import javax.validation.constraints.*;
 /**
  * YCSBWorkload
  */
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:38:23.147+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-08T12:41:32.345+02:00")
 public class YCSBWorkload   {
   @JsonProperty("dbEndpoints")
   private DBEndpoints dbEndpoints = null;

src/gen/java/de/uulm/omi/dbms/workload/api/ApiException.java

 package de.uulm.omi.dbms.workload.api;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:38:23.147+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-08T12:41:32.345+02:00")
 public class ApiException extends Exception{
     private int code;
     public ApiException (int code, String msg) {

src/gen/java/de/uulm/omi/dbms/workload/api/ApiOriginFilter.java

@@ -5,7 +5,7 @@ import java.io.IOException;
 import javax.servlet.*;
 import javax.servlet.http.HttpServletResponse;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:38:23.147+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-08T12:41:32.345+02:00")
 public class ApiOriginFilter implements javax.servlet.Filter {
     public void doFilter(ServletRequest request, ServletResponse response,
             FilterChain chain) throws IOException, ServletException {

src/gen/java/de/uulm/omi/dbms/workload/api/ApiResponseMessage.java

@@ -3,7 +3,7 @@ package de.uulm.omi.dbms.workload.api;
 import javax.xml.bind.annotation.XmlTransient;
 
 @javax.xml.bind.annotation.XmlRootElement
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:38:23.147+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-08T12:41:32.345+02:00")
 public class ApiResponseMessage {
     public static final int ERROR = 1;
     public static final int WARNING = 2;

src/gen/java/de/uulm/omi/dbms/workload/api/NotFoundException.java

 package de.uulm.omi.dbms.workload.api;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:38:23.147+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-08T12:41:32.345+02:00")
 public class NotFoundException extends ApiException {
     private int code;
     public NotFoundException (int code, String msg) {

src/gen/java/de/uulm/omi/dbms/workload/api/StringUtil.java

 package de.uulm.omi.dbms.workload.api;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:38:23.147+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-08T12:41:32.345+02:00")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).

src/gen/java/de/uulm/omi/dbms/workload/api/WorkloadApi.java

@@ -35,7 +35,7 @@ import javax.validation.constraints.*;
 
 @Produces({ "application/json" })
 @io.swagger.annotations.Api(description = "the workload API")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:38:23.147+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-08T12:41:32.345+02:00")
 public class WorkloadApi  {
    private final WorkloadApiService delegate;
 

src/gen/java/de/uulm/omi/dbms/workload/api/WorkloadApiService.java

@@ -21,7 +21,7 @@ import java.io.InputStream;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.validation.constraints.*;
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:38:23.147+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-08T12:41:32.345+02:00")
 public abstract class WorkloadApiService {
     public abstract Response workloadResultGet( @NotNull String taskId, @NotNull String workloadType,SecurityContext securityContext) throws NotFoundException;
     public abstract Response workloadStatusGet( String applicationInstanceId,SecurityContext securityContext) throws NotFoundException;

src/main/java/de/uulm/omi/dbms/workload/api/factories/WorkloadApiServiceFactory.java

@@ -3,7 +3,7 @@ package de.uulm.omi.dbms.workload.api.factories;
 import de.uulm.omi.dbms.workload.api.WorkloadApiService;
 import de.uulm.omi.dbms.workload.api.impl.WorkloadApiServiceImpl;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:38:23.147+02:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-08T12:41:32.345+02:00")
 public class WorkloadApiServiceFactory {
     private final static WorkloadApiService service = new WorkloadApiServiceImpl();
 

src/main/java/de/uulm/omi/dbms/workload/api/impl/WorkloadApiServiceImpl.java

@@ -224,11 +224,13 @@ public class WorkloadApiServiceImpl extends WorkloadApiService {
     Properties properties = WorkloadApiProperties.getInstance().getProperties();
     Long workloadTimestamp = System.currentTimeMillis();
 
+    LOGGER.debug(workload.toString());
+
     //Phase 1: generate data
-    LOGGER.debug("Satarting phase 1: data generations");
+    LOGGER.debug("Starting phase 1: data generations");
     String generateDataCommand= "";
     generateDataCommand = TSBSCommandBuilder.generateDataCommand( TSBS_BINARY, workload.getDbms(), workload.getTsbsDataGeneration());
-    generateDataCommand += properties.getProperty(WorkloadApiProperties.WORKLOAD_DATA_FOLDER) + workload.getDbms().toString() + "-data.gz";
+    generateDataCommand += properties.getProperty(WorkloadApiProperties.WORKLOAD_DATA_FOLDER) + workload.getDbms().toString().toLowerCase() + "-data.gz";
     LOGGER.debug("Generate data command: " + generateDataCommand);
 
     ProcessBuilder genDataProcess= new ProcessBuilder();
@@ -255,7 +257,7 @@ public class WorkloadApiServiceImpl extends WorkloadApiService {
 
     String generateQueriesCommand = "";
     generateQueriesCommand = TSBSCommandBuilder.generateQueriesCommand(TSBS_BINARY, workload.getDbms(), workload.getTsbsDataGeneration(), workload.getTsbsQueryGeneration());
-    generateQueriesCommand += properties.getProperty(WorkloadApiProperties.WORKLOAD_DATA_FOLDER) + workload.getDbms().toString() + "-queries.gz" ;
+    generateQueriesCommand += properties.getProperty(WorkloadApiProperties.WORKLOAD_DATA_FOLDER) + workload.getDbms().toString().toLowerCase() + "-queries.gz" ;
     LOGGER.debug(generateQueriesCommand);
 
 

src/main/java/de/uulm/omi/workload/tsbs/TSBSCommandBuilder.java

@@ -64,8 +64,8 @@ public class TSBSCommandBuilder {
         else throw new IllegalArgumentException("Missing or incorrect --log-interval parameter!");
 
 
-        if (dbms.toString() != null) {
-            generateDataCommand += "--format=\"" + dbms.toString()+ "\"";
+        if (dbms != null) {
+            generateDataCommand += "--format=\"" + dbms.toString().toLowerCase()+ "\"";
         } else throw new IllegalArgumentException("Missing or incorrect --log-interval parameter!");
 
 
@@ -127,8 +127,8 @@ public class TSBSCommandBuilder {
         }else throw new IllegalArgumentException("Missing or incorrect --query-type parameter!");
 
 
-        if (dbms.toString() != null) {
-            generateQueryCommand += "--format=\"" + dbms.toString() + "\"";
+        if (dbms != null) {
+            generateQueryCommand += "--format=\"" + dbms.toString().toLowerCase() + "\"";
         } else throw new IllegalArgumentException("Missing or incorrect --log-interval parameter!");
 
 
@@ -148,7 +148,7 @@ public class TSBSCommandBuilder {
 
 
 
-        String generateLoadCommand = "cat " + dataFolder + dbms.toString() + "-data.gz | gunzip | " +  binaryPath +  "tsbs_load_" + dbms.toString() + " ";
+        String generateLoadCommand = "cat " + dataFolder + dbms.toString().toLowerCase() + "-data.gz | gunzip | " +  binaryPath +  "tsbs_load_" + dbms.toString().toLowerCase() + " ";
 
         //common parameters
         if (tsbsLoadExecution.getDbName() != null){
@@ -187,7 +187,7 @@ public class TSBSCommandBuilder {
 
     public static String executeQueriesCommand(String binaryPath, String queryFolder, DbmsEnum dbms, TSBSQueryExecution tsbsQueryExecution, DBEndpoints dbEndpoints) {
 
-        String queriesCommand = "cat " + queryFolder +  dbms.toString() + "-queries.gz "   + " | gunzip | " + binaryPath + "tsbs_run_queries_" + dbms.toString() + " ";
+        String queriesCommand = "cat " + queryFolder +  dbms.toString().toLowerCase() + "-queries.gz "   + " | gunzip | " + binaryPath + "tsbs_run_queries_" + dbms.toString().toLowerCase() + " ";
 
         //common parameters
         if (tsbsQueryExecution.getWorkers() != null){

swagger/swagger.yaml

@@ -524,12 +524,12 @@ definitions:
       dbms:
         type: string
         enum:
-          - influx
-          - timescaledb
-          - mongodb
-          - cassandra
+          - INFLUX
+          - TIMESALEDB
+          - MONGODB
+          - CASSANDRA
         description: 'specifies the data format for the selected DBMS'
-        example: 'influx'
+        example: INFLUX
       tsbsDataGeneration:
         $ref: '#/definitions/TSBSDataGeneration'
       tsbsLoadExecution: