agreement) {
this.agreement = agreement;
}
+ /**
+ * Gets the value of the QuoteAuthorization property.
+ *
+ *
+ * This accessor method returns a reference to the live list,
+ * not a snapshot. Therefore any modification you make to the
+ * returned list will be present inside the JAXB object.
+ * This is why there is not a set method for the QuoteAuthorization property.
+ *
+ *
+ * For example, to add a new item, do as follows:
+ *
+ * getQuoteAuthorization().add(newItem);
+ *
+ *
+ *
+ *
+ * Objects of the following type(s) are allowed in the list
+ * {@link QuoteAuthorization }
+ *
+ *
+ */
+ @OneToMany(targetEntity = QuoteAuthorization.class, cascade = {
+ CascadeType.ALL
+ })
+ //@JoinColumn(name = "QUOTE_AUTHORIZATION_QUOTE_ID")
+ @JoinColumns({
+ @JoinColumn(name = "QUOTE_AUTHORIZATION_QUOTE_ID",referencedColumnName = "ID"),
+ @JoinColumn(name = "QUOTE_AUTHORIZATION_QUOTE_VERSION",referencedColumnName = "VERSION_")
+ })
+ public List getQuoteAuthorization() {
+ if (quoteAuthorization == null) {
+ quoteAuthorization = new ArrayList();
+ }
+ return this.quoteAuthorization;
+ }
+
+ /**
+ *
+ *
+ */
+ public void setQuoteAuthorization(List quoteAuthorization) {
+ this.quoteAuthorization = quoteAuthorization;
+ }
+
/**
* Gets the value of the quoteProductOfferingPrice property.
*
@@ -718,7 +788,11 @@ public void setAgreement(List agreement) {
@OneToMany(targetEntity = QuoteProductOfferingPrice.class, cascade = {
CascadeType.ALL
})
- @JoinColumn(name = "QUOTE_PRODUCT_OFFERING_PRICE_0")
+ //@JoinColumn(name = "QUOTE_PRODUCT_OFFERING_PRICE_0")
+ @JoinColumns({
+ @JoinColumn(name = "QUOTE_PRODUCT_OFFERING_PRICE_QUOTE_ID",referencedColumnName = "ID"),
+ @JoinColumn(name = "QUOTE_PRODUCT_OFFERING_PRICE_QUOTE_VERSION",referencedColumnName = "VERSION_")
+ })
public List getQuoteProductOfferingPrice() {
if (quoteProductOfferingPrice == null) {
quoteProductOfferingPrice = new ArrayList();
@@ -759,7 +833,11 @@ public void setQuoteProductOfferingPrice(List quotePr
@OneToMany(targetEntity = QuoteItem.class, cascade = {
CascadeType.ALL
})
- @JoinColumn(name = "QUOTE_ITEM_QUOTE_ID")
+ //@JoinColumn(name = "QUOTE_ITEM_QUOTE_ID")
+ @JoinColumns({
+ @JoinColumn(name = "QUOTE_ITEM_QUOTE_ID",referencedColumnName = "ID"),
+ @JoinColumn(name = "QUOTE_ITEM_QUOTE_VERSION",referencedColumnName = "VERSION_")
+ })
public List getQuoteItem() {
if (quoteItem == null) {
quoteItem = new ArrayList();
diff --git a/src/main/java/org/tmf/dsmapi/quote/model/QuoteAuthorization.java b/src/main/java/org/tmf/dsmapi/quote/model/QuoteAuthorization.java
index 183435c..23733c6 100644
--- a/src/main/java/org/tmf/dsmapi/quote/model/QuoteAuthorization.java
+++ b/src/main/java/org/tmf/dsmapi/quote/model/QuoteAuthorization.java
@@ -35,6 +35,7 @@
import javax.xml.bind.annotation.XmlType;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.annotation.JsonInclude;
+import javax.persistence.ManyToOne;
import org.tmf.dsmapi.commons.utils.CustomJsonDateSerializer;
@@ -65,7 +66,8 @@
"authorizationDate",
"authorizationState",
"authorizationSignatureRepresentation",
- "attachment"
+ "attachment",
+ "quoteProductOfferingPrice"
})
@JsonInclude(JsonInclude.Include.NON_NULL)
@Entity(name = "QuoteAuthorization")
@@ -83,8 +85,8 @@ public class QuoteAuthorization
protected Date authorizationDate;
protected String authorizationState;
protected String authorizationSignatureRepresentation;
- protected List attachment;
-
+ protected Attachment attachment;
+ protected List quoteProductOfferingPrice;
protected Long hjid;
/**
@@ -166,6 +168,47 @@ public void setAuthorizationSignatureRepresentation(String value) {
this.authorizationSignatureRepresentation = value;
}
+// /**
+// * Gets the value of the attachment property.
+// *
+// *
+// * This accessor method returns a reference to the live list,
+// * not a snapshot. Therefore any modification you make to the
+// * returned list will be present inside the JAXB object.
+// * This is why there is not a set method for the attachment property.
+// *
+// *
+// * For example, to add a new item, do as follows:
+// *
+// * getAttachment().add(newItem);
+// *
+// *
+// *
+// *
+// * Objects of the following type(s) are allowed in the list
+// * {@link Attachment }
+// *
+// *
+// */
+// @OneToMany(targetEntity = Attachment.class, cascade = {
+// CascadeType.ALL
+// })
+// @JoinColumn(name = "ATTACHMENT_QUOTE_AUTHORIZATI_0")
+// public List getAttachment() {
+// if (attachment == null) {
+// attachment = new ArrayList();
+// }
+// return this.attachment;
+// }
+
+// /**
+// *
+// *
+// */
+// public void setAttachment(List attachment) {
+// this.attachment = attachment;
+// }
+
/**
* Gets the value of the attachment property.
*
@@ -188,14 +231,11 @@ public void setAuthorizationSignatureRepresentation(String value) {
*
*
*/
- @OneToMany(targetEntity = Attachment.class, cascade = {
+ @ManyToOne(targetEntity = Attachment.class, cascade = {
CascadeType.ALL
})
- @JoinColumn(name = "ATTACHMENT_QUOTE_AUTHORIZATI_0")
- public List getAttachment() {
- if (attachment == null) {
- attachment = new ArrayList();
- }
+ @JoinColumn(name = "ATTACHMENT_QUOTE_AUTHORIZATION_HJID")
+ public Attachment getAttachment() {
return this.attachment;
}
@@ -203,10 +243,32 @@ public List getAttachment() {
*
*
*/
- public void setAttachment(List attachment) {
+ public void setAttachment(Attachment attachment) {
this.attachment = attachment;
}
+
+
+
+ @OneToMany(targetEntity = QuoteProductOfferingPrice.class, cascade = {
+ CascadeType.ALL
+ })
+ @JoinColumn(name = "QUOTE_PRODUCT_OFFERING_PRICE")
+ public List getQuoteProductOfferingPrice() {
+ if (quoteProductOfferingPrice == null) {
+ quoteProductOfferingPrice = new ArrayList();
+ }
+ return this.quoteProductOfferingPrice;
+ }
+ /**
+ *
+ *
+ */
+ public void setQuoteProductOfferingPrice(List quoteProductOfferingPrice) {
+ this.quoteProductOfferingPrice = quoteProductOfferingPrice;
+ }
+
+
/**
* Obtient la valeur de la propriété hjid.
*
@@ -235,4 +297,50 @@ public void setHjid(Long value) {
this.hjid = value;
}
+ public boolean equals(QuoteAuthorization quoteAuthor) {
+ if ((null!=this.getAttachment() && null!= quoteAuthor.getAttachment()
+ && !this.getAttachment().equals(quoteAuthor.getAttachment()))
+ || null!=this.getAttachment()&& null==quoteAuthor.getAttachment()
+ || null==this.getAttachment()&& null!=quoteAuthor.getAttachment() ) {
+ return false;
+ }
+
+ if ((null!=this.getAuthorizationDate() && null!= quoteAuthor.getAuthorizationDate()
+ && !this.getAuthorizationDate().equals(quoteAuthor.getAuthorizationDate()))
+ || null!=this.getAuthorizationDate()&& null==quoteAuthor.getAuthorizationDate()
+ || null==this.getAuthorizationDate()&& null!=quoteAuthor.getAuthorizationDate() ) {
+ return false;
+ }
+
+ if ((null!=this.getAuthorizationSignatureRepresentation() && null!= quoteAuthor.getAuthorizationSignatureRepresentation()
+ && !this.getAuthorizationSignatureRepresentation().equals(quoteAuthor.getAuthorizationSignatureRepresentation()))
+ || null!=this.getAuthorizationSignatureRepresentation()&& null==quoteAuthor.getAuthorizationSignatureRepresentation()
+ || null==this.getAuthorizationSignatureRepresentation()&& null!=quoteAuthor.getAuthorizationSignatureRepresentation() ) {
+ return false;
+ }
+
+ if ((null!=this.getAuthorizationState() && null!= quoteAuthor.getAuthorizationState()
+ && !this.getAuthorizationState().equals(quoteAuthor.getAuthorizationState()))
+ || null!=this.getAuthorizationState()&& null==quoteAuthor.getAuthorizationState()
+ || null==this.getAuthorizationState()&& null!=quoteAuthor.getAuthorizationState() ) {
+ return false;
+ }
+
+ if (null!=this.getQuoteProductOfferingPrice()&& null!=quoteAuthor.getQuoteProductOfferingPrice()){
+ if (this.getQuoteProductOfferingPrice().size() == quoteAuthor.getQuoteProductOfferingPrice().size()) {
+ for (int i=0; i itemQuoteProductOfferingPrice;
+ protected List itemQuoteAuthorization;
protected Long hjid;
@@ -418,6 +419,26 @@ public void setItemQuoteProductOfferingPrice(List ite
this.itemQuoteProductOfferingPrice = itemQuoteProductOfferingPrice;
}
+ @OneToMany(targetEntity = QuoteAuthorization.class, cascade = {
+ CascadeType.ALL
+ })
+ @JoinColumn(name = "ITEM_QUOTE_AUTHORIZATION_QUOTE_ID")
+ public List getItemQuoteAuthorization() {
+ if (itemQuoteAuthorization == null) {
+ itemQuoteAuthorization = new ArrayList();
+ }
+ return this.itemQuoteAuthorization;
+ }
+
+ /**
+ *
+ *
+ */
+ public void setItemQuoteAuthorization(List itemQuoteAuthorization) {
+ this.itemQuoteAuthorization = itemQuoteAuthorization;
+ }
+
+
/**
* Obtient la valeur de la propriété hjid.
*
diff --git a/src/main/java/org/tmf/dsmapi/quote/model/QuotePK.java b/src/main/java/org/tmf/dsmapi/quote/model/QuotePK.java
new file mode 100644
index 0000000..ef5fffa
--- /dev/null
+++ b/src/main/java/org/tmf/dsmapi/quote/model/QuotePK.java
@@ -0,0 +1,46 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.tmf.dsmapi.quote.model;
+
+import java.io.Serializable;
+
+/**
+ *
+ * @author Administrator
+ */
+public class QuotePK implements Serializable{
+ private String id;
+ private String version;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getVersion() {
+ return version;
+ }
+
+ public void setVersion(String version) {
+ this.version = version;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ return super.equals(obj); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public int hashCode() {
+ return super.hashCode(); //To change body of generated methods, choose Tools | Templates.
+ }
+
+
+
+}
diff --git a/src/main/java/org/tmf/dsmapi/quote/model/QuotePriceAlteration.java b/src/main/java/org/tmf/dsmapi/quote/model/QuotePriceAlteration.java
index 989097e..a1234e3 100644
--- a/src/main/java/org/tmf/dsmapi/quote/model/QuotePriceAlteration.java
+++ b/src/main/java/org/tmf/dsmapi/quote/model/QuotePriceAlteration.java
@@ -180,4 +180,25 @@ public void setHjid(Long value) {
this.hjid = value;
}
+ public boolean equals(QuotePriceAlteration quotePriceAl) {
+ if (null !=this.getDescription() && null!=quotePriceAl.getDescription()
+ && !this.getDescription().equals(quotePriceAl.getDescription())
+ || null!=this.getDescription()&& null==quotePriceAl.getDescription()
+ || null==this.getDescription()&& null!=quotePriceAl.getDescription()) {
+ return false;
+ }
+ if (null !=this.getName()&& null!=quotePriceAl.getName()
+ && !this.getName().equals(quotePriceAl.getName())
+ || null!=this.getName()&& null==quotePriceAl.getName()
+ || null==this.getName()&& null!=quotePriceAl.getName()) {
+ return false;
+ }
+ if (null !=this.getValidFor()&& null!=quotePriceAl.getValidFor()
+ && !this.getValidFor().equals(quotePriceAl.getValidFor())
+ || null!=this.getValidFor()&& null==quotePriceAl.getValidFor()
+ || null==this.getValidFor()&& null!=quotePriceAl.getValidFor()) {
+ return false;
+ }
+ return true;
+ }
}
diff --git a/src/main/java/org/tmf/dsmapi/quote/model/QuoteProductOfferingPrice.java b/src/main/java/org/tmf/dsmapi/quote/model/QuoteProductOfferingPrice.java
index 6449341..267e524 100644
--- a/src/main/java/org/tmf/dsmapi/quote/model/QuoteProductOfferingPrice.java
+++ b/src/main/java/org/tmf/dsmapi/quote/model/QuoteProductOfferingPrice.java
@@ -58,7 +58,8 @@
"recurringChargePeriod",
"priceCondition",
"quotePriceAlteration",
- "price"
+ "price",
+ "unitOfMeasure"
})
@JsonInclude(JsonInclude.Include.NON_NULL)
@Entity(name = "QuoteProductOfferingPrice")
@@ -75,6 +76,7 @@ public class QuoteProductOfferingPrice
protected String priceCondition;
protected QuotePriceAlteration quotePriceAlteration;
protected Price price;
+ protected String unitOfMeasure;
protected Long hjid;
@@ -212,6 +214,35 @@ public void setPrice(Price value) {
this.price = value;
}
+
+
+ /**
+ * Obtient la valeur de la propriété priceType.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ @Basic
+ @Column(name = "UNIT_OF_MEASURE", length = 255)
+ public String getUnitOfMeasure() {
+ return unitOfMeasure;
+ }
+
+ /**
+ * Définit la valeur de la propriété priceType.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setUnitOfMeasure(String value) {
+ this.unitOfMeasure = value;
+ }
+
+
/**
* Obtient la valeur de la propriété hjid.
*
@@ -240,4 +271,53 @@ public void setHjid(Long value) {
this.hjid = value;
}
+ public boolean equals(QuoteProductOfferingPrice offerPrice) {
+ if (null != this.getPrice()&& null != offerPrice.getPrice()
+ && !this.getPrice().equals(offerPrice.getPrice())
+ || null!=this.getPrice()&& null==offerPrice.getPrice()
+ || null==this.getPrice()&& null!=offerPrice.getPrice() ) {
+ return false;
+ }
+ if (null != this.getPriceCondition()&& null != offerPrice.getPriceCondition()
+ && !this.getPriceCondition().equals(offerPrice.getPriceCondition())
+ || null!=this.getPriceCondition()&& null==offerPrice.getPriceCondition()
+ || null==this.getPriceCondition()&& null!=offerPrice.getPriceCondition() ) {
+ return false;
+ }
+ if (null != this.getPriceType()&& null != offerPrice.getPriceType()
+ && !this.getPriceType().equals(offerPrice.getPriceType())
+ || null!=this.getPriceType()&& null==offerPrice.getPriceType()
+ || null==this.getPriceType()&& null!=offerPrice.getPriceType() ) {
+ return false;
+ }
+ if (null != this.getQuotePriceAlteration() && null != offerPrice.getQuotePriceAlteration()
+ && !this.getQuotePriceAlteration().equals(offerPrice.getQuotePriceAlteration())
+ || null!=this.getQuotePriceAlteration()&& null==offerPrice.getQuotePriceAlteration()
+ || null==this.getQuotePriceAlteration()&& null!=offerPrice.getQuotePriceAlteration() ) {
+ return false;
+ }
+ if (null != this.getRecurringChargePeriod()&& null != offerPrice.getRecurringChargePeriod()
+ && !this.getRecurringChargePeriod().equals(offerPrice.getRecurringChargePeriod())
+ || null!=this.getRecurringChargePeriod()&& null==offerPrice.getRecurringChargePeriod()
+ || null==this.getRecurringChargePeriod()&& null!=offerPrice.getRecurringChargePeriod()) {
+ return false;
+ }
+ if (null != this.getUnitOfMeasure()&& null != offerPrice.getUnitOfMeasure()
+ && !this.getUnitOfMeasure().equals(offerPrice.getUnitOfMeasure())
+ || null!=this.getUnitOfMeasure()&& null==offerPrice.getUnitOfMeasure()
+ || null==this.getUnitOfMeasure()&& null!=offerPrice.getUnitOfMeasure()) {
+ return false;
+ }
+ return true;
+ }
+
+ public boolean isEqualsQuotePriceAlteration (QuoteProductOfferingPrice offerPrice) {
+ if (null != this.getQuotePriceAlteration() && null != offerPrice.getQuotePriceAlteration()
+ && this.getQuotePriceAlteration().equals(offerPrice.getQuotePriceAlteration())
+ || null!=this.getQuotePriceAlteration()&& null==offerPrice.getQuotePriceAlteration()
+ || null==this.getQuotePriceAlteration()&& null!=offerPrice.getQuotePriceAlteration() ) {
+ return false;
+ }
+ return true;
+ }
}
diff --git a/src/main/java/org/tmf/dsmapi/quote/model/RelatedParty.java b/src/main/java/org/tmf/dsmapi/quote/model/RelatedParty.java
index 2b9d406..6712e03 100644
--- a/src/main/java/org/tmf/dsmapi/quote/model/RelatedParty.java
+++ b/src/main/java/org/tmf/dsmapi/quote/model/RelatedParty.java
@@ -203,5 +203,34 @@ public Long getHjid() {
public void setHjid(Long value) {
this.hjid = value;
}
+
+ public boolean equals(RelatedParty relatedParty) {
+ if ((null!=this.getId()&& null!= relatedParty.getId()
+ && !this.getId().equals(relatedParty.getId()))
+ || null!=this.getId()&& null==relatedParty.getId()
+ || null==this.getId()&& null!=relatedParty.getId() ) {
+ return false;
+ }
+ if ((null!=this.getName()&& null!= relatedParty.getName()
+ && !this.getName().equals(relatedParty.getName()))
+ || null!=this.getName()&& null==relatedParty.getName()
+ || null==this.getName()&& null!=relatedParty.getName() ) {
+ return false;
+ }
+ if ((null!=this.getRole()&& null!= relatedParty.getRole()
+ && !this.getRole().equals(relatedParty.getRole()))
+ || null!=this.getRole()&& null==relatedParty.getRole()
+ || null==this.getRole()&& null!=relatedParty.getRole() ) {
+ return false;
+ }
+ if ((null!=this.getHref()&& null!= relatedParty.getHref()
+ && !this.getHref().equals(relatedParty.getHref()))
+ || null!=this.getHref()&& null==relatedParty.getHref()
+ || null==this.getHref()&& null!=relatedParty.getHref() ) {
+ return false;
+ }
+
+ return true;
+ }
}
diff --git a/src/main/java/org/tmf/dsmapi/quote/model/ValidFor.java b/src/main/java/org/tmf/dsmapi/quote/model/ValidFor.java
index bb1c1e0..8b164fc 100644
--- a/src/main/java/org/tmf/dsmapi/quote/model/ValidFor.java
+++ b/src/main/java/org/tmf/dsmapi/quote/model/ValidFor.java
@@ -161,4 +161,20 @@ public void setHjid(Long value) {
this.hjid = value;
}
+ public boolean equals(ValidFor var) {
+ if ((null!=this.getStartDateTime()&& null!= var.getStartDateTime()
+ && !this.getStartDateTime().toString().equals(var.getStartDateTime().toString()))
+ || null!=this.getStartDateTime()&& null==var.getStartDateTime()
+ || null==this.getStartDateTime()&& null!=var.getStartDateTime()) {
+ return false;
+ }
+ if ((null!=this.getEndDateTime()&& null!= var.getEndDateTime()
+ && !this.getEndDateTime().toString().equals(var.getEndDateTime().toString()))
+ || null!=this.getEndDateTime()&& null==var.getEndDateTime()
+ || null==this.getEndDateTime()&& null!=var.getEndDateTime() ) {
+ return false;
+ }
+
+ return true;
+ }
}
diff --git a/src/main/java/org/tmf/dsmapi/subscriber/Current.java b/src/main/java/org/tmf/dsmapi/subscriber/Current.java
index 7e37e6c..4163593 100644
--- a/src/main/java/org/tmf/dsmapi/subscriber/Current.java
+++ b/src/main/java/org/tmf/dsmapi/subscriber/Current.java
@@ -29,12 +29,15 @@ public void doGet(HttpServletRequest request, HttpServletResponse response)
List events = subscriberFacade.findAll();
ServletOutputStream servletOut = response.getOutputStream();
EventBag mostRecentNotif = null;
- for (int i = 0; events.size() > i; i++) {
- mostRecentNotif = events.get(i);
- if (events.get(i).getDateEvent().after(mostRecentNotif.getDateEvent())) {
- mostRecentNotif = events.get(i);
+ if (null != events && events.size() > 0){
+ mostRecentNotif = events.get(0);
+ for (int i = 0; events.size()-1 > i; i++) {
+ if (events.get(i+1).getDateEvent().after(mostRecentNotif.getDateEvent())) {
+ mostRecentNotif = events.get(i);
+ }
}
}
+
if (null != mostRecentNotif) {
servletOut.write(mostRecentNotif.getEvent());
response.setContentType("application/json");