Skip to content

Commit

Permalink
Merge pull request #322 from szprutamich/master
Browse files Browse the repository at this point in the history
Version 2.46
  • Loading branch information
szprutamich authored Oct 3, 2017
2 parents 43d35b0 + 6453cc4 commit c8b1e97
Show file tree
Hide file tree
Showing 4 changed files with 55 additions and 2 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.testdroid</groupId>
<artifactId>testdroid-api</artifactId>
<version>2.44</version>
<version>2.46</version>
<packaging>jar</packaging>
<name>Testdroid API v2</name>
<url>https://github.com/bitbar/testdroid-api</url>
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/testdroid/api/APIEntity.java
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,8 @@
APIActivity.class,
APIDevicePicker.class,
APIDeviceFilter.class,
APIDeviceFilterGroup.class
APIDeviceFilterGroup.class,
APICountryVatRate.class
})
public abstract class APIEntity {

Expand Down
51 changes: 51 additions & 0 deletions src/main/java/com/testdroid/api/model/APICountryVatRate.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
package com.testdroid.api.model;

import com.fasterxml.jackson.annotation.JsonIgnore;
import com.testdroid.api.APIEntity;

import javax.xml.bind.annotation.XmlRootElement;

/**
* @author Michał Szpruta <[email protected]>
*/
@XmlRootElement
public class APICountryVatRate extends APIEntity {

private String countryCode;

private Integer vatRate;

public APICountryVatRate() {
}

public APICountryVatRate(Long id, String countryCode, Integer vatRate) {
super(id);
this.countryCode = countryCode;
this.vatRate = vatRate;
}

public String getCountryCode() {
return countryCode;
}

public void setCountryCode(String countryCode) {
this.countryCode = countryCode;
}

public Integer getVatRate() {
return vatRate;
}

public void setVatRate(Integer vatRate) {
this.vatRate = vatRate;
}

@Override
@JsonIgnore
protected <T extends APIEntity> void clone(T from) {
APICountryVatRate countryVatRate = (APICountryVatRate) from;
cloneBase(from);
this.countryCode = countryVatRate.countryCode;
this.vatRate = countryVatRate.vatRate;
}
}
1 change: 1 addition & 0 deletions src/main/java/com/testdroid/api/model/jaxb.index
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,4 @@ APIActivity
APIDevicePicker
APIDeviceFilter
APIDeviceFilterGroup
APICountryVatRate

0 comments on commit c8b1e97

Please sign in to comment.