Skip to content

Commit

Permalink
Update to 1.0.6
Browse files Browse the repository at this point in the history
  • Loading branch information
olivere committed Feb 27, 2017
1 parent 08549ec commit 771e655
Show file tree
Hide file tree
Showing 7 changed files with 100 additions and 32 deletions.
16 changes: 8 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@ repositories {
}

dependencies {
compile 'org.apache.httpcomponents:httpclient:4.5.1'
compile 'org.eclipse.jetty:jetty-client:9.3.7.v20160115'
compile 'com.squareup.okhttp3:okhttp:3.4.2'
compile 'commons-io:commons-io:2.4'
compile 'com.google.code.gson:gson:2.5'
compile 'org.apache.httpcomponents:httpclient:4.5.3'
compile 'org.eclipse.jetty:jetty-client:9.4.2.v20170220'
compile 'com.squareup.okhttp3:okhttp:3.6.0'
compile 'commons-io:commons-io:2.5'
compile 'com.google.code.gson:gson:2.8.0'
compile 'commons-codec:commons-codec:1.10'
compile 'com.damnhandy:handy-uri-templates:2.1.3'
compile 'joda-time:joda-time:2.9.1'
compile 'com.damnhandy:handy-uri-templates:2.1.6'
compile 'joda-time:joda-time:2.9.7'
testCompile 'junit:junit:4.12'
}

sourceCompatibility = 1.7
version = '1.0.1'
version = '1.0.6'
jar {
manifest {
attributes 'Implementation-Title': 'Meplato Mall 1.0 API',
Expand Down
16 changes: 8 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<groupId>com.meplato</groupId>
<artifactId>meplato-mall</artifactId>
<version>1.0.5</version>
<version>1.0.6</version>
<packaging>jar</packaging>

<name>Meplato Mall 1.0 API</name>
Expand All @@ -28,17 +28,17 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.1</version>
<version>4.5.3</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.4</version>
<version>2.5</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.5</version>
<version>2.8.0</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
Expand All @@ -48,22 +48,22 @@
<dependency>
<groupId>com.damnhandy</groupId>
<artifactId>handy-uri-templates</artifactId>
<version>2.1.3</version>
<version>2.1.6</version>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.9.1</version>
<version>2.9.7</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-client</artifactId>
<version>9.3.7.v20160115</version>
<version>9.4.2.v20170220</version>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>3.4.2</version>
<version>3.6.0</version>
</dependency>
</dependencies>

Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/meplato/mall/catalogs/Service.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
/**
* Package catalogs implements the Meplato Mall API.
*
* @copyright 2014-2016 Meplato GmbH, Switzerland.
* @copyright 2014-2017 Meplato GmbH, Switzerland.
* @author Meplato API Team <[email protected]>
* @version 1.0.5
* @license Copyright (c) 2015 Meplato GmbH, Switzerland. All rights reserved.
* @version 1.0.6
* @license Copyright (c) 2015-2017 Meplato GmbH, Switzerland. All rights reserved.
* @see <a href="https://developer.meplato.com/mall/#terms">Terms of Service</a>
* @see <a href="https://developer.meplato.com/mall/">External documentation</a>
*/
Expand All @@ -41,7 +41,7 @@ public class Service {
/** API title. */
public static String TITLE = "Meplato Mall API";
/** API version. */
public static String VERSION = "1.0.5";
public static String VERSION = "1.0.6";
/** User Agent. */
public static String USER_AGENT = "meplato-java-client/2.0";
/** Default base URL of the API endpoints. */
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/meplato/mall/mlt/Service.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
/**
* Package mlt implements the Meplato Mall API.
*
* @copyright 2014-2016 Meplato GmbH, Switzerland.
* @copyright 2014-2017 Meplato GmbH, Switzerland.
* @author Meplato API Team <[email protected]>
* @version 1.0.5
* @license Copyright (c) 2015-2016 Meplato GmbH, Switzerland. All rights reserved.
* @version 1.0.6
* @license Copyright (c) 2015-2017 Meplato GmbH, Switzerland. All rights reserved.
* @see <a href="https://developer.meplato.com/mall/#terms">Terms of Service</a>
* @see <a href="https://developer.meplato.com/mall/">External documentation</a>
*/
Expand All @@ -41,7 +41,7 @@ public class Service {
/** API title. */
public static String TITLE = "Meplato Mall API";
/** API version. */
public static String VERSION = "1.0.5";
public static String VERSION = "1.0.6";
/** User Agent. */
public static String USER_AGENT = "meplato-java-client/2.0";
/** Default base URL of the API endpoints. */
Expand Down
68 changes: 68 additions & 0 deletions src/main/java/com/meplato/mall/products/Product.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
* Product is a good or service in a catalog.
*/
public class Product {
@SerializedName("asin")
private String asin;
@SerializedName("availability")
private Availability availability;
@SerializedName("blobs")
Expand Down Expand Up @@ -113,6 +115,10 @@ public class Product {
private String mpn;
@SerializedName("mpsc")
private String mPSC;
@SerializedName("multiSupplierId")
private String multiSupplierId;
@SerializedName("multiSupplierName")
private String multiSupplierName;
@SerializedName("name")
private String name;
@SerializedName("ou")
Expand Down Expand Up @@ -145,6 +151,8 @@ public class Product {
private String spn;
@SerializedName("taxCode")
private String taxCode;
@SerializedName("taxRate")
private double taxRate;
@SerializedName("tenantId")
private long tenantId;
@SerializedName("thumbnail")
Expand All @@ -168,6 +176,20 @@ public class Product {
public Product() {
}

/**
* ASIN is the unique Amazon article number of the product.
*/
public String getAsin() {
return this.asin;
}

/**
* ASIN is the unique Amazon article number of the product.
*/
public void setAsin(String asin) {
this.asin = asin;
}

/**
* Availability allows the update of product availability data, e.g. the number
* of items in stock or the date when the product will be available again.
Expand Down Expand Up @@ -812,6 +834,38 @@ public void setMPSC(String mPSC) {
this.mPSC = mPSC;
}

/**
* MultiSupplierID represents an optional field for the unique identifier of a
* supplier in a multi-supplier catalog.
*/
public String getMultiSupplierId() {
return this.multiSupplierId;
}

/**
* MultiSupplierID represents an optional field for the unique identifier of a
* supplier in a multi-supplier catalog.
*/
public void setMultiSupplierId(String multiSupplierId) {
this.multiSupplierId = multiSupplierId;
}

/**
* MultiSupplierName represents an optional field for the name of the supplier
* in a multi-supplier catalog.
*/
public String getMultiSupplierName() {
return this.multiSupplierName;
}

/**
* MultiSupplierName represents an optional field for the name of the supplier
* in a multi-supplier catalog.
*/
public void setMultiSupplierName(String multiSupplierName) {
this.multiSupplierName = multiSupplierName;
}

/**
* Name of the product.
*/
Expand Down Expand Up @@ -1054,6 +1108,20 @@ public void setTaxCode(String taxCode) {
this.taxCode = taxCode;
}

/**
* TaxRate for this product, a numeric value between 0.0 and 1.0.
*/
public double getTaxRate() {
return this.taxRate;
}

/**
* TaxRate for this product, a numeric value between 0.0 and 1.0.
*/
public void setTaxRate(double taxRate) {
this.taxRate = taxRate;
}

/**
* TenantID is the identifier of the tenant.
*/
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/meplato/mall/products/Service.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
/**
* Package products implements the Meplato Mall API.
*
* @copyright 2014-2016 Meplato GmbH, Switzerland.
* @copyright 2014-2017 Meplato GmbH, Switzerland.
* @author Meplato API Team <[email protected]>
* @version 1.0.5
* @license Copyright (c) 2015-2016 Meplato GmbH, Switzerland. All rights reserved.
* @version 1.0.6
* @license Copyright (c) 2015-2017 Meplato GmbH, Switzerland. All rights reserved.
* @see <a href="https://developer.meplato.com/mall/#terms">Terms of Service</a>
* @see <a href="https://developer.meplato.com/mall/">External documentation</a>
*/
Expand All @@ -41,7 +41,7 @@ public class Service {
/** API title. */
public static String TITLE = "Meplato Mall API";
/** API version. */
public static String VERSION = "1.0.5";
public static String VERSION = "1.0.6";
/** User Agent. */
public static String USER_AGENT = "meplato-java-client/2.0";
/** Default base URL of the API endpoints. */
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/meplato/mall/vendors/Service.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
/**
* Package vendors implements the Meplato Mall API.
*
* @copyright 2014-2016 Meplato GmbH, Switzerland.
* @copyright 2014-2017 Meplato GmbH, Switzerland.
* @author Meplato API Team <[email protected]>
* @version 1.0.5
* @license Copyright (c) 2015-2016 Meplato GmbH, Switzerland. All rights reserved.
* @version 1.0.6
* @license Copyright (c) 2015-2017 Meplato GmbH, Switzerland. All rights reserved.
* @see <a href="https://developer.meplato.com/mall/#terms">Terms of Service</a>
* @see <a href="https://developer.meplato.com/mall/">External documentation</a>
*/
Expand All @@ -41,7 +41,7 @@ public class Service {
/** API title. */
public static String TITLE = "Meplato Mall API";
/** API version. */
public static String VERSION = "1.0.5";
public static String VERSION = "1.0.6";
/** User Agent. */
public static String USER_AGENT = "meplato-java-client/2.0";
/** Default base URL of the API endpoints. */
Expand Down

0 comments on commit 771e655

Please sign in to comment.