Merge branch 'dev_marcos' into 'developer'

Dev marcos

See merge request ByteBot/web/bytebot-service!13

src/main/java/com/bytesw/bytebot/controller/BusinessParameterController.java

@@ -205,7 +205,7 @@ public class BusinessParameterController extends XDFController<BusinessParameter
         if (this.service.validateKey(bean)) {
             throw new ReferentialIntegrityException("Ya existe un identificador con el mismo nombre");
         } else {
-            bean = this.service.create(bean);
+            bean = this.service.createBP(bean);
             return new ResponseEntity(this.gson.toJson(bean), HttpStatus.OK);
         }
     }

src/main/java/com/bytesw/bytebot/controller/GoalController.java

@@ -59,6 +59,7 @@ public class GoalController extends XDFController<GoalBean, Long> {
         String info = "";
         try{
             goalService.updateGoalForActions(body, id);
+            info = "Ok";
             return new ResponseEntity(gson.toJson(info), HttpStatus.OK);
         } catch (Exception e) {
             info = e.getMessage();

src/main/java/com/bytesw/bytebot/etl/model/Action.java

@@ -17,9 +17,8 @@ public class Action {
 
     @Id
     @Column(name = "action_id")
-    @TableGenerator(name = "AVB_ACTION_GENERATOR", table = "SEQUENCE_TABLE", pkColumnName = "SEQ_NAME",
-            valueColumnName = "SEQ_COUNT", pkColumnValue = "AVB_ACTION_SEQ", allocationSize = 1)
-    @GeneratedValue(strategy = GenerationType.TABLE, generator = "AVB_ACTION_GENERATOR")
+    @SequenceGenerator(name = "AVB_ACTION_GENERATOR", sequenceName = "AVB_ACTION_SEQ", initialValue = 1, allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "AVB_ACTION_GENERATOR")
     private Long id;
 
     @Column(name = "action_ident")

src/main/java/com/bytesw/bytebot/etl/model/DeleteDataSensibleControl.java

@@ -17,9 +17,8 @@ public class DeleteDataSensibleControl {
 
     @Id
     @Column(name = "dsmc_id")
-    @TableGenerator(name = "AVB_DELETE_MSG_SENS_CONTROL_GENERATOR", table = "SEQUENCE_TABLE", pkColumnName = "SEQ_NAME",
-            valueColumnName = "SEQ_COUNT", pkColumnValue = "AVB_DELETE_MSG_SENS_CONTROL_SEQ", allocationSize = 1)
-    @GeneratedValue(strategy = GenerationType.TABLE,generator = "AVB_DELETE_MSG_SENS_CONTROL_GENERATOR")
+    @SequenceGenerator(name = "AVB_DELETE_MSG_SENS_CONTROL_GENERATOR", sequenceName = "AVB_DELETE_SENS_MSG_CONTROL_SEQ", initialValue = 1, allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.SEQUENCE,generator = "AVB_DELETE_MSG_SENS_CONTROL_GENERATOR")
     private Long id;
 
     @Column(name = "agent_id")

src/main/java/com/bytesw/bytebot/etl/model/DeleteDataSensibleLog.java

@@ -17,9 +17,8 @@ public class DeleteDataSensibleLog {
 
     @Id
     @Column(name = "dele_id")
-    @TableGenerator(name = "AVB_DELETE_MSG_SENS_LOG_GENERATOR", table = "SEQUENCE_TABLE", pkColumnName = "SEQ_NAME",
-            valueColumnName = "SEQ_COUNT", pkColumnValue = "AVB_DELETE_MSG_SENS_LOG_SEQ", allocationSize = 1)
-    @GeneratedValue(strategy = GenerationType.TABLE,generator = "AVB_DELETE_MSG_SENS_LOG_GENERATOR")
+    @SequenceGenerator(name = "AVB_DELETE_MSG_SENS_LOG_GENERATOR", sequenceName = "AVB_DELETE_SENS_MSG_LOG_SEQ", initialValue = 1, allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.SEQUENCE,generator = "AVB_DELETE_MSG_SENS_LOG_GENERATOR")
     private Long id;
 
     @Column(name = "inten_id")

src/main/java/com/bytesw/bytebot/etl/model/EventHistory.java

@@ -16,9 +16,8 @@ public class EventHistory {
 
     @Id
     @Column(name = "evenh_id")
-    @TableGenerator(name = "AVB_EVENT_HISTORY_GENERATOR", table = "SEQUENCE_TABLE", pkColumnName = "SEQ_NAME",
-            valueColumnName = "SEQ_COUNT", pkColumnValue = "AVB_EVENT_HISTORY_SEQ", allocationSize = 1)
-    @GeneratedValue(strategy = GenerationType.TABLE,generator = "AVB_EVENT_HISTORY_GENERATOR")
+    @SequenceGenerator(name = "AVB_EVENT_HISTORY_GENERATOR", sequenceName = "AVB_EVENT_HISTORY_SEQ", initialValue = 1, allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.SEQUENCE,generator = "AVB_EVENT_HISTORY_GENERATOR")
     private Long id;
 
     @Column(name = "evenh_sendid")

src/main/java/com/bytesw/bytebot/etl/model/Goal.java

@@ -15,9 +15,8 @@ public class Goal {
 
     @Id
     @Column(name = "goal_id")
-    @TableGenerator(name = "AVB_GOAL_GENERATOR", table = "SEQUENCE_TABLE", pkColumnName = "SEQ_NAME",
-            valueColumnName = "SEQ_COUNT", pkColumnValue = "AVB_GOAL_SEQ", allocationSize = 1)
-    @GeneratedValue(strategy = GenerationType.TABLE,generator = "AVB_GOAL_GENERATOR")
+    @SequenceGenerator(name = "AVB_GOAL_GENERATOR", sequenceName = "AVB_GOAL_SEQ", initialValue = 1, allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.SEQUENCE,generator = "AVB_GOAL_GENERATOR")
     private Long id;
 
     @Column(name = "goal_ident")

src/main/java/com/bytesw/bytebot/etl/model/GoalForActions.java

@@ -17,9 +17,8 @@ public class GoalForActions {
 
     @Id
     @Column(name = "gfac_id")
-    @TableGenerator(name = "AVB_GOALFORACTIONS_GENERATOR", table = "SEQUENCE_TABLE", pkColumnName = "SEQ_NAME",
-            valueColumnName = "SEQ_COUNT", pkColumnValue = "AVB_GOALFORACTIONS_SEQ", allocationSize = 1)
-    @GeneratedValue(strategy = GenerationType.TABLE, generator = "AVB_GOALFORACTIONS_GENERATOR")
+    @SequenceGenerator(name = "AVB_GOALFORACTIONS_GENERATOR", sequenceName = "AVB_GOALFORACTIONS_SEQ", initialValue = 1, allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "AVB_GOALFORACTIONS_GENERATOR")
     private Long id;
 
     @Column(name = "goal_id")

src/main/java/com/bytesw/bytebot/etl/model/Intent.java

@@ -16,9 +16,8 @@ public class Intent {
 
     @Id
     @Column(name = "inten_id")
-    @TableGenerator(name = "AVB_INTENT_DASHBOARD_GENERATOR", table = "SEQUENCE_TABLE", pkColumnName = "SEQ_NAME",
-            valueColumnName = "SEQ_COUNT", pkColumnValue = "AVB_INTENT_DASHBOARD_SEQ", allocationSize = 1)
-    @GeneratedValue(strategy = GenerationType.TABLE,generator = "AVB_INTENT_DASHBOARD_GENERATOR")
+    @SequenceGenerator(name = "AVB_INTENT_DASHBOARD_GENERATOR", sequenceName = "AVB_INTENT_SEQ", initialValue = 1, allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.SEQUENCE,generator = "AVB_INTENT_DASHBOARD_GENERATOR")
     private Long id;
 
     @Column(name = "inten_ident")

src/main/java/com/bytesw/bytebot/etl/model/Message.java

@@ -20,9 +20,8 @@ public class Message {
 
     @Id
     @Column(name = "messa_id")
-    @TableGenerator(name = "AVB_MESSAGE_GENERATOR", table = "SEQUENCE_TABLE", pkColumnName = "SEQ_NAME",
-            valueColumnName = "SEQ_COUNT", pkColumnValue = "AVB_MESSAGE_SEQ", allocationSize = 1)
-    @GeneratedValue(strategy = GenerationType.TABLE,generator = "AVB_MESSAGE_GENERATOR")
+    @SequenceGenerator(name = "AVB_MESSAGE_GENERATOR", sequenceName = "AVB_MESSAGE_SEQ", initialValue = 1, allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.SEQUENCE,generator = "AVB_MESSAGE_GENERATOR")
     private Long id;
 
     @Column(name = "session_id")

src/main/java/com/bytesw/bytebot/etl/model/Response.java

@@ -16,9 +16,8 @@ public class Response {
 
     @Id
     @Column(name = "respo_id")
-    @TableGenerator(name = "AVB_RESPONSE_GENERATOR", table = "SEQUENCE_TABLE", pkColumnName = "SEQ_NAME",
-            valueColumnName = "SEQ_COUNT", pkColumnValue = "AVB_RESPONSE_SEQ", allocationSize = 1)
-    @GeneratedValue(strategy = GenerationType.TABLE,generator = "AVB_RESPONSE_GENERATOR")
+    @SequenceGenerator(name = "AVB_RESPONSE_GENERATOR", sequenceName = "AVB_RESPONSE_SEQ", initialValue = 1, allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "AVB_RESPONSE_GENERATOR")
     private Long id;
 
     @Column(name = "respo_date")

src/main/java/com/bytesw/bytebot/etl/model/Session.java

@@ -17,9 +17,8 @@ public class Session {
 
     @Id
     @Column(name = "session_id")
-    @TableGenerator(name = "AVB_SESSION_GENERATOR", table = "SEQUENCE_TABLE", pkColumnName = "SEQ_NAME",
-            valueColumnName = "SEQ_COUNT", pkColumnValue = "AVB_SESSION_SEQ", allocationSize = 1)
-    @GeneratedValue(strategy = GenerationType.TABLE,generator = "AVB_SESSION_GENERATOR")
+    @SequenceGenerator(name = "AVB_SESSION_GENERATOR", sequenceName = "AVB_SESSION_SEQ", initialValue = 1, allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.SEQUENCE,generator = "AVB_SESSION_GENERATOR")
     private Long id;
 
     @Column(name = "session_date", nullable = false)

src/main/java/com/bytesw/bytebot/etl/model/SessionAction.java

@@ -16,9 +16,8 @@ public class SessionAction {
 
     @Id
     @Column(name = "asess_id")
-    @TableGenerator(name = "AVB_ACTION_SESSION_GENERATOR", table = "SEQUENCE_TABLE", pkColumnName = "SEQ_NAME",
-            valueColumnName = "SEQ_COUNT", pkColumnValue = "AVB_ACTION_SESSION_SEQ", allocationSize = 1)
-    @GeneratedValue(strategy = GenerationType.TABLE,generator = "AVB_ACTION_SESSION_GENERATOR")
+    @SequenceGenerator(name = "AVB_ACTION_SESSION_GENERATOR", sequenceName = "AVB_ACTION_SESSION_SEQ", initialValue = 1, allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.SEQUENCE,generator = "AVB_ACTION_SESSION_GENERATOR")
     private Long id;
 
     @ManyToOne(optional = false)

src/main/java/com/bytesw/bytebot/etl/model/User.java

@@ -14,9 +14,8 @@ public class User {
 
     @Id
     @Column(name = "user_id")
-    @TableGenerator(name = "AVB_USER_GENERATOR", table = "SEQUENCE_TABLE", pkColumnName = "SEQ_NAME",
-            valueColumnName = "SEQ_COUNT", pkColumnValue = "AVB_USER_SEQ", allocationSize = 1)
-    @GeneratedValue(strategy = GenerationType.TABLE,generator = "AVB_USER_GENERATOR")
+    @SequenceGenerator(name = "AVB_USER_GENERATOR", sequenceName = "AVB_USER_SEQ", initialValue = 1, allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.SEQUENCE,generator = "AVB_USER_GENERATOR")
     private Long id;
 
     @Column(name = "user_ident")

src/main/java/com/bytesw/bytebot/model/Agent.java

@@ -24,9 +24,8 @@ public class Agent implements Serializable {
 
     @Id
     @Column(name = "agen_id")
-    @GeneratedValue(strategy = GenerationType.TABLE, generator = "AVB_AGENT_GENERATOR")
-    @TableGenerator(name = "AVB_AGENT_GENERATOR", table = "SEQUENCE_TABLE", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT",
-            pkColumnValue = "AVB_AGENT_SEQ", allocationSize = 1)
+    @SequenceGenerator(name = "AVB_AGENT_GENERATOR", sequenceName = "AVB_AGENT_SEQ", initialValue = 1, allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "AVB_AGENT_GENERATOR")
     private Long id;
 
     @Column(name = "agen_iden")
@@ -71,4 +70,5 @@ public class Agent implements Serializable {
 
     @OneToMany(mappedBy = "agent")
     private List<FrequentQuestion> frequentQuestions;
+
 }

src/main/java/com/bytesw/bytebot/model/BusinessParameter.java

@@ -15,7 +15,9 @@ import java.math.BigInteger;
 @Entity
 @Table(name = "AVB_BUSINESS_PARAMETER")
 @NamedQuery(name = "BusinessParameter.findByPK", query = "Select u from BusinessParameter u where u.id = ?1")
-@Getter @Setter @EqualsAndHashCode @ToString(exclude = "id")
+@Getter @Setter
+@EqualsAndHashCode
+@ToString(exclude = "id")
 public class BusinessParameter implements Serializable {
 
     @Id

src/main/java/com/bytesw/bytebot/model/BusinessParameterConfiguration.java

@@ -11,7 +11,6 @@ import java.io.Serializable;
 import java.math.BigInteger;
 import java.time.OffsetDateTime;
 
-
 @Audited
 @Entity
 @Table(name = "AVB_BUSINESS_PARAMETER_CONFIG")
@@ -21,8 +20,8 @@ public class BusinessParameterConfiguration implements Serializable, Comparable<
 
     @Id
     @Column(name = "BUPC_ID")
-    @SequenceGenerator(name = "AVB_BUSINESS_PARAMETER_CONFIG_GENERATOR", sequenceName = "AVB_BUSINESS_PARAM_CONFIG_SEQ", initialValue = 1, allocationSize = 1)
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "AVB_BUSINESS_PARAMETER_CONFIG_GENERATOR")
+    @SequenceGenerator(name = "AVB_BUSINESS_PARAMETER_CONFIG_GEN", sequenceName = "AVB_BUSINESS_PARAMETER_CONFIG_SEQ", initialValue = 1, allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "AVB_BUSINESS_PARAMETER_CONFIG_GEN")
     private BigInteger id;
 
     @Version

src/main/java/com/bytesw/bytebot/model/CalendarException.java

@@ -28,8 +28,8 @@ public abstract class CalendarException implements Serializable {
 
     @Id
     @Column(name = "CALE_EXC_ID")
-//    @SequenceGenerator(name = "AVB_CALENDAR_EXCEPTION_GENERATOR", sequenceName = "AVB_CALENDAR_EXCEPTION_SEQ", initialValue = 1, allocationSize = 1)
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "AVB_CALENDAR_EXCEPTION_GENERATOR")
+    @SequenceGenerator(name = "AVB_CALENDAR_EXCEPTION_GENERATOR", sequenceName = "AVB_CALENDAR_EXCEPTION_SEQ", initialValue = 1, allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "AVB_CALENDAR_EXCEPTION_GENERATOR")
     private BigInteger id;
 
     @Version

src/main/java/com/bytesw/bytebot/model/CalendarExceptionFull.java

@@ -28,8 +28,8 @@ public class CalendarExceptionFull implements Serializable {
 
     @Id
     @Column(name = "CALE_EXC_ID")
-//    @SequenceGenerator(name = "AVB_CALENDAR_EXCEPTION_GENERATOR", sequenceName = "AVB_CALENDAR_EXCEPTION_SEQ", initialValue = 1, allocationSize = 1)
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "AVB_CALENDAR_EXCEPTION_GENERATOR")
+    @SequenceGenerator(name = "AVB_CALENDAR_EXCEPTION_GENERATOR", sequenceName = "AVB_CALENDAR_EXCEPTION_SEQ", initialValue = 1, allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "AVB_CALENDAR_EXCEPTION_GENERATOR")
     private BigInteger id;
 
     @Version

src/main/java/com/bytesw/bytebot/model/Channel.java

@@ -27,9 +27,8 @@ public class Channel {
 
     @Id
     @Column(name = "CHAN_ID")
-    @GeneratedValue(strategy = GenerationType.TABLE, generator = "AVB_CHANNEL_GENERATOR")
-    @TableGenerator(name = "AVB_CHANNEL_GENERATOR", table = "SEQUENCE_TABLE", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT",
-            pkColumnValue = "AVB_CHANNEL_SEQ", allocationSize = 1)
+    @SequenceGenerator(name = "AVB_CHANNEL_GENERATOR", sequenceName = "AVB_CHANNEL_SEQ", initialValue = 1, allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "AVB_CHANNEL_GENERATOR")
     private Long id;
 
     @Column(name = "CHAN_IDEN")

src/main/java/com/bytesw/bytebot/model/ChannelParam.java

@@ -29,9 +29,8 @@ public class ChannelParam {
 
     @Id
     @Column(name = "CHPA_ID")
-    @GeneratedValue(strategy = GenerationType.TABLE, generator = "AVB_CHANNEL_PARAM_GENERATOR")
-    @TableGenerator(name = "AVB_CHANNEL_PARAM_GENERATOR", table = "SEQUENCE_TABLE", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT",
-            pkColumnValue = "AVB_CHANNEL_PARAM_SEQ", allocationSize = 1)
+    @SequenceGenerator(name = "AVB_CHANNEL_PARAM_GENERATOR", sequenceName = "AVB_CHANNEL_PARAM_SEQ", initialValue = 1, allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "AVB_CHANNEL_PARAM_GENERATOR")
     private Long id;
 
     @Column(name = "CHPA_IDEN")

src/main/java/com/bytesw/bytebot/model/Country.java

@@ -16,9 +16,8 @@ public class Country {
 
     @Id
     @Column(name = "coun_id")
-    @GeneratedValue(strategy = GenerationType.TABLE, generator = "AVB_COUNTRY_GENERATOR")
-    @TableGenerator(name = "AVB_COUNTRY_GENERATOR", table = "SEQUENCE_TABLE", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT",
-            pkColumnValue = "AVB_COUNTRY_SEQ", allocationSize = 1)
+    @SequenceGenerator(name = "AVB_COUNTRY_GENERATOR", sequenceName = "AVB_COUNTRY_SEQ", initialValue = 1, allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "AVB_COUNTRY_GENERATOR")
     private Long id;
 
     @Column(name = "coun_name", nullable = false)

src/main/java/com/bytesw/bytebot/model/DeploymentChannel.java

@@ -30,9 +30,8 @@ public class DeploymentChannel {
 
     @Id
     @Column(name = "DCHA_ID")
-    @GeneratedValue(strategy = GenerationType.TABLE, generator = "AVB_DEPLOYMENT_CHANNEL_GENERATOR")
-    @TableGenerator(name = "AVB_DEPLOYMENT_CHANNEL_GENERATOR", table = "SEQUENCE_TABLE", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT",
-            pkColumnValue = "AVB_DEPLOYMENT_CHANNEL_SEQ", allocationSize = 1)
+    @SequenceGenerator(name = "AVB_DEPLOYMENT_CHANNEL_GENERATOR", sequenceName = "AVB_DEPLOYMENT_CHANNEL_SEQ", initialValue = 1, allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "AVB_DEPLOYMENT_CHANNEL_GENERATOR")
     private Long id;
 
     @Column(name = "DCHA_NAME")

src/main/java/com/bytesw/bytebot/model/DeploymentChannelParamValue.java

@@ -28,9 +28,8 @@ public class DeploymentChannelParamValue {
 
     @Id
     @Column(name = "CHPV_ID")
-    @GeneratedValue(strategy = GenerationType.TABLE, generator = "AVB_DEPLOYMENT_CHANNEL_PARAM_VALUE_GENERATOR")
-    @TableGenerator(name = "AVB_DEPLOYMENT_CHANNEL_PARAM_VALUE_GENERATOR", table = "SEQUENCE_TABLE", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT",
-            pkColumnValue = "AVB_DEPLOYMENT_CHANNEL_PARAM_VALUE_SEQ", allocationSize = 1)
+    @SequenceGenerator(name = "AVB_DEPLOYMENT_CHANNEL_PARAM_VALUE_GENERATOR", sequenceName = "AVB_DEPLOYMENT_CHANNEL_PARAM_VALUE_SEQ", initialValue = 1, allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "AVB_DEPLOYMENT_CHANNEL_PARAM_VALUE_GENERATOR")
     private Long id;
 
     @ManyToOne

src/main/java/com/bytesw/bytebot/model/FrequentQuestion.java

@@ -33,9 +33,8 @@ import java.time.OffsetDateTime;
 public class FrequentQuestion {
     @Id
     @Column(name = "FQUE_ID")
-    @GeneratedValue(strategy = GenerationType.TABLE, generator = "AVB_FREQUENT_QUESTION_GENERATOR")
-    @TableGenerator(name = "AVB_FREQUENT_QUESTION_GENERATOR", table = "SEQUENCE_TABLE", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT",
-            pkColumnValue = "AVB_FREQUENT_QUESTION_SEQ", initialValue = 1, allocationSize = 1)
+    @SequenceGenerator(name = "AVB_FREQUENT_QUESTION_GENERATOR", sequenceName = "AVB_FREQUENT_QUESTION_SEQ", initialValue = 1, allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "AVB_FREQUENT_QUESTION_GENERATOR")
     private Long id;
 
     @Column(name = "FQUE_UUID")

src/main/java/com/bytesw/bytebot/model/QuestionFile.java

@@ -6,17 +6,8 @@
 package com.bytesw.bytebot.model;
 
 import java.time.LocalDateTime;
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Lob;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
-import javax.persistence.TableGenerator;
+import javax.persistence.*;
+
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -36,9 +27,8 @@ public class QuestionFile {
 
     @Id
     @Column(name = "QUFI_ID")
-    @TableGenerator(name = "AVB_QUESTION_FILE_GENERATOR", table = "SEQUENCE_TABLE", pkColumnName = "SEQ_NAME",
-            valueColumnName = "SEQ_COUNT", pkColumnValue = "AVB_QUESTION_FILE_SEQ",  allocationSize = 1)
-    @GeneratedValue(strategy = GenerationType.TABLE, generator = "AVB_QUESTION_FILE_GENERATOR")
+    @SequenceGenerator(name = "AVB_QUESTION_FILE_GENERATOR", sequenceName = "AVB_QUESTION_FILE_SEQ", initialValue = 1, allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "AVB_QUESTION_FILE_GENERATOR")
     private Long id;
     
     @Column(name = "QUFI_UUID", nullable = false)

src/main/java/com/bytesw/bytebot/model/SchedulerTask.java

@@ -25,8 +25,8 @@ public class SchedulerTask implements Serializable {
 
     @Id
     @Column(name = "SHTA_ID")
-//    @SequenceGenerator(name = "AVB_SCHEDULER_TASK_GENERATOR", sequenceName = "AVB_SCHEDULER_TASK_SEQ", initialValue = 1, allocationSize = 1)
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "AVB_SCHEDULER_TASK_GENERATOR")
+    @SequenceGenerator(name = "AVB_SCHEDULER_TASK_GENERATOR", sequenceName = "AVB_SCHEDULER_TASK_SEQ", initialValue = 1, allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "AVB_SCHEDULER_TASK_GENERATOR")
     private BigInteger id;
 
     @Version

src/main/java/com/bytesw/bytebot/model/Timezone.java

@@ -25,9 +25,8 @@ public class Timezone {
 
     @Id
     @Column(name = "tzon_id")
-    @GeneratedValue(strategy = GenerationType.TABLE, generator = "avb_timezone_generator")
-    @TableGenerator(name = "avb_timezone_generator", table = "sequence_table", pkColumnName = "seq_name", valueColumnName = "seq_count",
-            pkColumnValue = "avb_timezone_seq", allocationSize = 1)
+    @SequenceGenerator(name = "avb_timezone_generator", sequenceName = "AVB_TIMEZONE_SEQ", initialValue = 1, allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "avb_timezone_generator")
     private Long id;
 
     @Column(name = "tzon_zone", nullable = false)

src/main/java/com/bytesw/bytebot/model/WeekScheduler.java

@@ -26,8 +26,8 @@ public class WeekScheduler implements Serializable {
 
     @Id
     @Column(name = "WESC_ID")
-//    @SequenceGenerator(name = "AVB_WEEK_SCHEDULER_GENERATOR", sequenceName = "AVB_WEEK_SCHEDULER_SEQ", initialValue = 1, allocationSize = 1)
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "AVB_WEEK_SCHEDULER_GENERATOR")
+    @SequenceGenerator(name = "AVB_WEEK_SCHEDULER_GENERATOR", sequenceName = "AVB_WEEK_SCHEDULER_SEQ", initialValue = 1, allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "AVB_WEEK_SCHEDULER_GENERATOR")
     private BigInteger id;
 
     @Version

src/main/java/com/bytesw/bytebot/service/BusinessParameterService.java

@@ -230,8 +230,8 @@ public class BusinessParameterService extends XDFService<BusinessParameter, Busi
         }
     }
 
-    @Override
-    public BusinessParameterBean create(BusinessParameterBean bean) {
+    //@Override
+    public BusinessParameterBean createBP(BusinessParameterBean bean) {
         BusinessParameter model = new BusinessParameter();
         BusinessParameterConfiguration businessParameterConfiguration = new BusinessParameterConfiguration();
         if (this.existsByUK(bean)) {

src/main/java/com/bytesw/bytebot/service/GoalForActionService.java

@@ -128,7 +128,6 @@ public class GoalForActionService extends XDFService<GoalForActions, GoalForActi
             }
             Map<String, String> map = new HashMap<>();
             map.put("IdAction", String.valueOf(action.getId()));
-            map.put("desc", action.getIdentifier());
             list.add(map);
         }