diff --git a/Poseiden-skeleton/pom.xml b/Poseiden-skeleton/pom.xml index a7dcbc04dc..52a638eb6f 100644 --- a/Poseiden-skeleton/pom.xml +++ b/Poseiden-skeleton/pom.xml @@ -60,6 +60,11 @@ com.h2database h2 + + org.javassist + javassist + 3.25.0-GA + diff --git a/Poseiden-skeleton/spring-boot-skeleton.iml b/Poseiden-skeleton/spring-boot-skeleton.iml deleted file mode 100644 index bac7aedc30..0000000000 --- a/Poseiden-skeleton/spring-boot-skeleton.iml +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Poseiden-skeleton/src/main/java/com/nnk/springboot/domain/BidList.java b/Poseiden-skeleton/src/main/java/com/nnk/springboot/domain/BidList.java index 3a0e27efc8..455dd33a30 100644 --- a/Poseiden-skeleton/src/main/java/com/nnk/springboot/domain/BidList.java +++ b/Poseiden-skeleton/src/main/java/com/nnk/springboot/domain/BidList.java @@ -1,15 +1,220 @@ package com.nnk.springboot.domain; -import org.springframework.beans.factory.annotation.Required; import javax.persistence.*; -import javax.validation.constraints.Digits; import javax.validation.constraints.NotBlank; -import java.sql.Date; import java.sql.Timestamp; @Entity @Table(name = "bidlist") public class BidList { - // TODO: Map columns in data table BIDLIST with corresponding java fields + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer bidListId; + @NotBlank(message = "Account is mandatory") + private String account; + @NotBlank(message = "Type is mandatory") + private String type; + private Double bidQuantity; + private Double askQuantity; + private Double bid; + private Double ask; + private String benchmark; + private Timestamp bidListDate; + private String commentary; + private String security; + private String status; + private String trader; + private String book; + private String creationName; + private Timestamp creationDate; + private String revisionName; + private Timestamp revisionDate; + private String dealName; + private String dealType; + private String sourceListId; + private String side; + + + public BidList() { + } + + public BidList(String account_test, String type_test, double v) { + } + + public Integer getBidListId() { + return bidListId; + } + + public void setBidListId(Integer bidListId) { + this.bidListId = bidListId; + } + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public Double getBidQuantity() { + return bidQuantity; + } + + public void setBidQuantity(Double bidQuantity) { + this.bidQuantity = bidQuantity; + } + + public Double getAskQuantity() { + return askQuantity; + } + + public void setAskQuantity(Double askQuantity) { + this.askQuantity = askQuantity; + } + + public Double getBid() { + return bid; + } + + public void setBid(Double bid) { + this.bid = bid; + } + + public Double getAsk() { + return ask; + } + + public void setAsk(Double ask) { + this.ask = ask; + } + + public String getBenchmark() { + return benchmark; + } + + public void setBenchmark(String benchmark) { + this.benchmark = benchmark; + } + + public Timestamp getBidListDate() { + return bidListDate; + } + + public void setBidListDate(Timestamp bidListDate) { + this.bidListDate = bidListDate; + } + + public String getCommentary() { + return commentary; + } + + public void setCommentary(String commentary) { + this.commentary = commentary; + } + + public String getSecurity() { + return security; + } + + public void setSecurity(String security) { + this.security = security; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getTrader() { + return trader; + } + + public void setTrader(String trader) { + this.trader = trader; + } + + public String getBook() { + return book; + } + + public void setBook(String book) { + this.book = book; + } + + public String getCreationName() { + return creationName; + } + + public void setCreationName(String creationName) { + this.creationName = creationName; + } + + public Timestamp getCreationDate() { + return creationDate; + } + + public void setCreationDate(Timestamp creationDate) { + this.creationDate = creationDate; + } + + public String getRevisionName() { + return revisionName; + } + + public void setRevisionName(String revisionName) { + this.revisionName = revisionName; + } + + public Timestamp getRevisionDate() { + return revisionDate; + } + + public void setRevisionDate(Timestamp revisionDate) { + this.revisionDate = revisionDate; + } + + public String getDealName() { + return dealName; + } + + public void setDealName(String dealName) { + this.dealName = dealName; + } + + public String getDealType() { + return dealType; + } + + public void setDealType(String dealType) { + this.dealType = dealType; + } + + public String getSourceListId() { + return sourceListId; + } + + public void setSourceListId(String sourceListId) { + this.sourceListId = sourceListId; + } + + public String getSide() { + return side; + } + + public void setSide(String side) { + this.side = side; + } } diff --git a/Poseiden-skeleton/src/main/java/com/nnk/springboot/domain/CurvePoint.java b/Poseiden-skeleton/src/main/java/com/nnk/springboot/domain/CurvePoint.java index 151f80d02f..e57b748319 100644 --- a/Poseiden-skeleton/src/main/java/com/nnk/springboot/domain/CurvePoint.java +++ b/Poseiden-skeleton/src/main/java/com/nnk/springboot/domain/CurvePoint.java @@ -1,9 +1,7 @@ package com.nnk.springboot.domain; -import org.hibernate.validator.constraints.Length; import javax.persistence.*; -import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.sql.Timestamp; @@ -11,5 +9,76 @@ @Entity @Table(name = "curvepoint") public class CurvePoint { - // TODO: Map columns in data table CURVEPOINT with corresponding java fields + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; + @NotNull(message = "must not be null") + private Integer curveId; + private Timestamp asOfDate; + private Double term; + private Double value; + private Timestamp creationDate; + + public CurvePoint() { + } + + public CurvePoint(Integer id, Integer curveId, Timestamp asOfDate, Double term, Double value, Timestamp creationDate) { + this.id = id; + this.curveId = curveId; + this.asOfDate = asOfDate; + this.term = term; + this.value = value; + this.creationDate = creationDate; + } + + public CurvePoint(int i, double v, double v1) { + } + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Integer getCurveId() { + return curveId; + } + + public void setCurveId(Integer curveId) { + this.curveId = curveId; + } + + public Timestamp getAsOfDate() { + return asOfDate; + } + + public void setAsOfDate(Timestamp asOfDate) { + this.asOfDate = asOfDate; + } + + public Double getTerm() { + return term; + } + + public void setTerm(Double term) { + this.term = term; + } + + public Double getValue() { + return value; + } + + public void setValue(Double value) { + this.value = value; + } + + public Timestamp getCreationDate() { + return creationDate; + } + + public void setCreationDate(Timestamp creationDate) { + this.creationDate = creationDate; + } } diff --git a/Poseiden-skeleton/src/main/java/com/nnk/springboot/domain/Rating.java b/Poseiden-skeleton/src/main/java/com/nnk/springboot/domain/Rating.java index 12d1be58c0..408a1c38f1 100644 --- a/Poseiden-skeleton/src/main/java/com/nnk/springboot/domain/Rating.java +++ b/Poseiden-skeleton/src/main/java/com/nnk/springboot/domain/Rating.java @@ -1,12 +1,69 @@ package com.nnk.springboot.domain; import javax.persistence.*; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.sql.Timestamp; @Entity @Table(name = "rating") public class Rating { - // TODO: Map columns in data table RATING with corresponding java fields + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; + private String moodysRating; + private String sandPRating; + private String fitchRating; + private Integer orderNumber; + + public Rating() { + } + + public Rating(String moodys_rating, String sand_pRating, String fitch_rating, int i) { + } + + public Rating(Integer id, String moodysRating, String sandPRating, String fitchRating, Integer orderNumber) { + this.id = id; + this.moodysRating = moodysRating; + this.sandPRating = sandPRating; + this.fitchRating = fitchRating; + this.orderNumber = orderNumber; + } + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getMoodysRating() { + return moodysRating; + } + + public void setMoodysRating(String moodysRating) { + this.moodysRating = moodysRating; + } + + public String getSandPRating() { + return sandPRating; + } + + public void setSandPRating(String sandPRating) { + this.sandPRating = sandPRating; + } + + public String getFitchRating() { + return fitchRating; + } + + public void setFitchRating(String fitchRating) { + this.fitchRating = fitchRating; + } + + public Integer getOrderNumber() { + return orderNumber; + } + + public void setOrderNumber(Integer orderNumber) { + this.orderNumber = orderNumber; + } } diff --git a/Poseiden-skeleton/src/main/java/com/nnk/springboot/domain/RuleName.java b/Poseiden-skeleton/src/main/java/com/nnk/springboot/domain/RuleName.java index b8ac970edf..e25b8e1b4d 100644 --- a/Poseiden-skeleton/src/main/java/com/nnk/springboot/domain/RuleName.java +++ b/Poseiden-skeleton/src/main/java/com/nnk/springboot/domain/RuleName.java @@ -1,11 +1,89 @@ package com.nnk.springboot.domain; import javax.persistence.*; -import javax.validation.constraints.NotBlank; -import java.sql.Timestamp; @Entity @Table(name = "rulename") public class RuleName { - // TODO: Map columns in data table RULENAME with corresponding java fields + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; + private String name; + private String description; + private String json; + private String template; + private String sqlStr; + private String sqlPart; + + public RuleName() { + } + + public RuleName(Integer id, String name, String description, String json, String template, String sqlStr, String sqlPart) { + this.id = id; + this.name = name; + this.description = description; + this.json = json; + this.template = template; + this.sqlStr = sqlStr; + this.sqlPart = sqlPart; + } + + public RuleName(String rule_name, String description, String json, String template, String sql, String sql_part) { + } + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getJson() { + return json; + } + + public void setJson(String json) { + this.json = json; + } + + public String getTemplate() { + return template; + } + + public void setTemplate(String template) { + this.template = template; + } + + public String getSqlStr() { + return sqlStr; + } + + public void setSqlStr(String sqlStr) { + this.sqlStr = sqlStr; + } + + public String getSqlPart() { + return sqlPart; + } + + public void setSqlPart(String sqlPart) { + this.sqlPart = sqlPart; + } } diff --git a/Poseiden-skeleton/src/main/java/com/nnk/springboot/domain/Trade.java b/Poseiden-skeleton/src/main/java/com/nnk/springboot/domain/Trade.java index b6db7c13b7..798afbf16c 100644 --- a/Poseiden-skeleton/src/main/java/com/nnk/springboot/domain/Trade.java +++ b/Poseiden-skeleton/src/main/java/com/nnk/springboot/domain/Trade.java @@ -1,12 +1,207 @@ package com.nnk.springboot.domain; import javax.persistence.*; -import javax.validation.constraints.NotBlank; import java.sql.Timestamp; @Entity @Table(name = "trade") public class Trade { - // TODO: Map columns in data table TRADE with corresponding java fields + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer tradeId; + private String account; + private String type; + private Double buyQuantity; + private Double sellQuantity; + private Double buyPrice; + private Double sellPrice; + private String benchmark; + private Timestamp tradeDate; + private String security; + private String status; + private String trader; + private String book; + private String creationName; + private Timestamp creationDate; + private String revisionName; + private Timestamp revisionDate; + private String dealName; + private String dealType; + private String sourceListId; + private String side; + + public Trade() { + } + + public Trade(String trade_account, String type) { + } + + public Integer getTradeId() { + return tradeId; + } + + public void setTradeId(Integer tradeId) { + this.tradeId = tradeId; + } + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public Double getBuyQuantity() { + return buyQuantity; + } + + public void setBuyQuantity(Double buyQuantity) { + this.buyQuantity = buyQuantity; + } + + public Double getSellQuantity() { + return sellQuantity; + } + + public void setSellQuantity(Double sellQuantity) { + this.sellQuantity = sellQuantity; + } + + public Double getBuyPrice() { + return buyPrice; + } + + public void setBuyPrice(Double buyPrice) { + this.buyPrice = buyPrice; + } + + public Double getSellPrice() { + return sellPrice; + } + + public void setSellPrice(Double sellPrice) { + this.sellPrice = sellPrice; + } + + public String getBenchmark() { + return benchmark; + } + + public void setBenchmark(String benchmark) { + this.benchmark = benchmark; + } + + public Timestamp getTradeDate() { + return tradeDate; + } + + public void setTradeDate(Timestamp tradeDate) { + this.tradeDate = tradeDate; + } + + public String getSecurity() { + return security; + } + + public void setSecurity(String security) { + this.security = security; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getTrader() { + return trader; + } + + public void setTrader(String trader) { + this.trader = trader; + } + + public String getBook() { + return book; + } + + public void setBook(String book) { + this.book = book; + } + + public String getCreationName() { + return creationName; + } + + public void setCreationName(String creationName) { + this.creationName = creationName; + } + + public Timestamp getCreationDate() { + return creationDate; + } + + public void setCreationDate(Timestamp creationDate) { + this.creationDate = creationDate; + } + + public String getRevisionName() { + return revisionName; + } + + public void setRevisionName(String revisionName) { + this.revisionName = revisionName; + } + + public Timestamp getRevisionDate() { + return revisionDate; + } + + public void setRevisionDate(Timestamp revisionDate) { + this.revisionDate = revisionDate; + } + + public String getDealName() { + return dealName; + } + + public void setDealName(String dealName) { + this.dealName = dealName; + } + + public String getDealType() { + return dealType; + } + + public void setDealType(String dealType) { + this.dealType = dealType; + } + + public String getSourceListId() { + return sourceListId; + } + + public void setSourceListId(String sourceListId) { + this.sourceListId = sourceListId; + } + + public String getSide() { + return side; + } + + public void setSide(String side) { + this.side = side; + } } diff --git a/Poseiden-skeleton/src/main/resources/application.properties b/Poseiden-skeleton/src/main/resources/application.properties index 8b194cc76e..695b29bd97 100644 --- a/Poseiden-skeleton/src/main/resources/application.properties +++ b/Poseiden-skeleton/src/main/resources/application.properties @@ -5,7 +5,7 @@ logging.level.org.springframework=INFO spring.datasource.driver-class-name=com.mysql.jdbc.Driver spring.datasource.url=jdbc:mysql://localhost:3306/demo spring.datasource.username=root -spring.datasource.password= +spring.datasource.password=Dieumerci80! ################### Hibernate Configuration ##########################