Merge pull request #1 from FIWARE-TMForum/develop

Merge Develop
FIWARE-TMForum · Dec 22, 2016 · ad0990d · ad0990d
2 parents 052bbeb + 7710db7
commit ad0990d
Show file tree

Hide file tree

Showing 6 changed files with 156 additions and 88 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,11 +3,11 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.tmf.dsmapi</groupId>
-    <artifactId>DSPRODUCTCATALOG2</artifactId>
-    <version>2.0-SNAPSHOT</version>
+    <artifactId>DSProductCatalog</artifactId>
+    <version>5.4.1</version>
     <packaging>war</packaging>
 
-    <name>DSPRODUCTCATALOG2</name>
+    <name>DSProductCatalog</name>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -70,16 +70,16 @@
     </dependencies>
 
     <build>
-        <finalName>DSPRODUCTCATALOG2</finalName>
+        <finalName>DSProductCatalog</finalName>
 
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.2</version>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
             <plugin>

diff --git a/src/main/java/org/tmf/dsmapi/catalog/resource/AbstractEntity.java b/src/main/java/org/tmf/dsmapi/catalog/resource/AbstractEntity.java
@@ -49,7 +49,7 @@ public abstract class AbstractEntity implements Serializable {
     @Column(name = "NAME", nullable = true)
     private String name;
 
-    @Column(name = "DESCRIPTION", nullable = true)
+    @Column(name = "DESCRIPTION", nullable = true, length=5000)
     private String description;
 
     @Column(name = "LAST_UPDATE", nullable = true)

diff --git a/src/main/java/org/tmf/dsmapi/catalog/resource/product/AlterationPrice.java b/src/main/java/org/tmf/dsmapi/catalog/resource/product/AlterationPrice.java
@@ -30,17 +30,17 @@ public class AlterationPrice implements Serializable {
 
     private final static Logger logger = Logger.getLogger(ProductOffering.class.getName());
 
-    @Column(name = "PRICE_ALT_TAX_INCLUDED_AMOUNT", nullable = true)
+    @Column(name = "PRICE_ALT_TAX_INCLUDED_AMOUNT", nullable = true, precision = 38, scale = 2)
     BigDecimal taxIncludedAmount;
 
-    @Column(name = "PRICE_ALT_DUTY_FREE_AMOUNT", nullable = true)
+    @Column(name = "PRICE_ALT_DUTY_FREE_AMOUNT", nullable = true, precision = 38, scale = 2)
     BigDecimal dutyFreeAmount;
 
-    @Column(name = "PRICE_ALT_TAX_RATE", nullable = true)
+    @Column(name = "PRICE_ALT_TAX_RATE", nullable = true, precision = 38, scale = 2)
     BigDecimal taxRate;
 
-    @Column(name = "PRICE_ALT_PERCENTAGE", nullable = true)
-    String percentage;
+    @Column(name = "PRICE_ALT_PERCENTAGE", nullable = true, precision = 5, scale = 2)
+    BigDecimal percentage;
 
     public AlterationPrice() {
     }
@@ -69,11 +69,11 @@ public void setTaxRate(BigDecimal taxRate) {
         this.taxRate = taxRate;
     }
 
-    public String getPercentage() {
+    public BigDecimal getPercentage() {
         return percentage;
     }
 
-    public void setPercentage(String percentage) {
+    public void setPercentage(BigDecimal percentage) {
         this.percentage = percentage;
     }
 
@@ -131,7 +131,7 @@ public static AlterationPrice createProto() {
         alterationPrice.taxIncludedAmount = new BigDecimal(13.00);
         alterationPrice.dutyFreeAmount = new BigDecimal(12.20);
         alterationPrice.taxRate = new BigDecimal(14.01);
-        alterationPrice.percentage = "0";
+        alterationPrice.percentage = new BigDecimal(0);
 
         return alterationPrice;
     }

diff --git a/src/main/java/org/tmf/dsmapi/catalog/resource/product/Price.java b/src/main/java/org/tmf/dsmapi/catalog/resource/product/Price.java
@@ -27,19 +27,19 @@
 public class Price implements Serializable {
     private final static long serialVersionUID = 1L;
 
-    @Column(name = "TAX_INCLUDED_AMOUNT", nullable = true)
+    @Column(name = "TAX_INCLUDED_AMOUNT", nullable = true, precision = 38, scale = 2)
     BigDecimal taxIncludedAmount;
 
-    @Column(name = "DUTY_FREE_AMOUNT", nullable = true)
+    @Column(name = "DUTY_FREE_AMOUNT", nullable = true, precision = 38, scale = 2)
     BigDecimal dutyFreeAmount;
 
-    @Column(name = "TAX_RATE", nullable = true)
+    @Column(name = "TAX_RATE", nullable = true, precision = 38, scale = 2)
     BigDecimal taxRate;
 
     @Column(name = "CURRENCY_CODE", nullable = true)
     String currencyCode;
 
-    @Column(name = "PERCENTAGE", nullable = true)
+    @Column(name = "PERCENTAGE", nullable = true, precision = 5, scale = 2)
     BigDecimal percentage;
 
     public Price() {

diff --git a/src/main/java/org/tmf/dsmapi/catalog/resource/product/ProductSpecCharacteristic.java b/src/main/java/org/tmf/dsmapi/catalog/resource/product/ProductSpecCharacteristic.java
@@ -3,6 +3,7 @@
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
+import javax.persistence.Column;
 import javax.persistence.Embeddable;
 import org.codehaus.jackson.annotate.JsonIgnore;
 import org.codehaus.jackson.annotate.JsonProperty;
@@ -61,7 +62,10 @@ public class ProductSpecCharacteristic implements Serializable {
 
     private String id;
     private String name;
+
+    @Column(name = "DESCRIPTION", nullable = true, length=5000)
     private String description;
+
     private CharacteristicValueType valueType;
     private Boolean configurable;
     private TimeRange validFor;