Skip to content

Commit b77ce56

Browse files
committed
Updated sources
1 parent 296114f commit b77ce56

File tree

8 files changed

+331
-47
lines changed

8 files changed

+331
-47
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Add following repository and dependency to your project's POM
2424
<dependency>
2525
<groupId>com.groupdocs</groupId>
2626
<artifactId>groupdocs-conversion-cloud</artifactId>
27-
<version>24.3</version>
27+
<version>24.4</version>
2828
<scope>compile</scope>
2929
</dependency>
3030
```
@@ -43,7 +43,7 @@ repositories {
4343
...
4444
dependencies {
4545
...
46-
implementation 'com.groupdocs:groupdocs-conversion-cloud:24.3'
46+
implementation 'com.groupdocs:groupdocs-conversion-cloud:24.4'
4747
}
4848
```
4949

@@ -100,7 +100,7 @@ mvn package -D maven.test.skip=true
100100

101101
Then manually install the following JARs:
102102

103-
* target/groupdocs-conversion-cloud-24.3.jar
103+
* target/groupdocs-conversion-cloud-24.4.jar
104104
* target/lib/*.jar
105105

106106
## Licensing

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<artifactId>groupdocs-conversion-cloud</artifactId>
66
<packaging>jar</packaging>
77
<name>groupdocs-conversion-cloud</name>
8-
<version>24.3</version>
8+
<version>24.4</version>
99
<url>https://github.com/groupdocs-conversion-cloud/groupdocs-conversion-cloud-java</url>
1010
<description>Java library for communicating with the GroupDocs.Conversion Cloud API</description>
1111
<scm>

simplified-pom.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>com.groupdocs</groupId>
77
<artifactId>groupdocs-conversion-cloud</artifactId>
8-
<version>24.3</version>
8+
<version>24.4</version>
99
<packaging>jar</packaging>
1010

1111
<name>groupdocs-conversion-cloud</name>

src/main/java/com/groupdocs/cloud/conversion/client/ApiClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public ApiClient(Configuration configuration) {
9595
this.json = new JSON();
9696

9797
// Set default User-Agent.
98-
setUserAgent("java-sdk/24.3");
98+
setUserAgent("java-sdk/24.4");
9999

100100
// Set connection timeout
101101
setConnectTimeout(configuration.getTimeout());

src/main/java/com/groupdocs/cloud/conversion/model/CadLoadOptions.java

Lines changed: 88 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -45,51 +45,62 @@
4545
*/
4646
@ApiModel(description = "Options for loading CAD documents")
4747
public class CadLoadOptions extends LoadOptions {
48-
@SerializedName("width")
49-
private Integer width = null;
50-
51-
@SerializedName("height")
52-
private Integer height = null;
53-
5448
@SerializedName("layoutNames")
5549
private List<String> layoutNames = null;
5650

57-
public CadLoadOptions width(Integer width) {
58-
this.width = width;
59-
return this;
60-
}
51+
@SerializedName("backgroundColor")
52+
private String backgroundColor = null;
6153

62-
/**
63-
* Set desired page width for converting CAD document
64-
* @return width
65-
**/
66-
@ApiModelProperty(required = true, value = "Set desired page width for converting CAD document")
67-
public Integer getWidth() {
68-
return width;
69-
}
54+
/**
55+
* Gets or sets type of drawing.
56+
*/
57+
@JsonAdapter(DrawTypeEnum.Adapter.class)
58+
public enum DrawTypeEnum {
59+
USEDRAWCOLOR("UseDrawColor"),
60+
61+
USEOBJECTCOLOR("UseObjectColor");
7062

71-
public void setWidth(Integer width) {
72-
this.width = width;
73-
}
63+
private String value;
7464

75-
public CadLoadOptions height(Integer height) {
76-
this.height = height;
77-
return this;
78-
}
65+
DrawTypeEnum(String value) {
66+
this.value = value;
67+
}
7968

80-
/**
81-
* Set desired page height for converting CAD document
82-
* @return height
83-
**/
84-
@ApiModelProperty(required = true, value = "Set desired page height for converting CAD document")
85-
public Integer getHeight() {
86-
return height;
87-
}
69+
public String getValue() {
70+
return value;
71+
}
72+
73+
@Override
74+
public String toString() {
75+
return String.valueOf(value);
76+
}
77+
78+
public static DrawTypeEnum fromValue(String text) {
79+
for (DrawTypeEnum b : DrawTypeEnum.values()) {
80+
if (String.valueOf(b.value).equals(text)) {
81+
return b;
82+
}
83+
}
84+
return null;
85+
}
8886

89-
public void setHeight(Integer height) {
90-
this.height = height;
87+
public static class Adapter extends TypeAdapter<DrawTypeEnum> {
88+
@Override
89+
public void write(final JsonWriter jsonWriter, final DrawTypeEnum enumeration) throws IOException {
90+
jsonWriter.value(enumeration.getValue());
91+
}
92+
93+
@Override
94+
public DrawTypeEnum read(final JsonReader jsonReader) throws IOException {
95+
String value = jsonReader.nextString();
96+
return DrawTypeEnum.fromValue(String.valueOf(value));
97+
}
98+
}
9199
}
92100

101+
@SerializedName("drawType")
102+
private DrawTypeEnum drawType = null;
103+
93104
public CadLoadOptions layoutNames(List<String> layoutNames) {
94105
this.layoutNames = layoutNames;
95106
return this;
@@ -116,6 +127,42 @@ public void setLayoutNames(List<String> layoutNames) {
116127
this.layoutNames = layoutNames;
117128
}
118129

130+
public CadLoadOptions backgroundColor(String backgroundColor) {
131+
this.backgroundColor = backgroundColor;
132+
return this;
133+
}
134+
135+
/**
136+
* Gets or sets a background color.
137+
* @return backgroundColor
138+
**/
139+
@ApiModelProperty(value = "Gets or sets a background color.")
140+
public String getBackgroundColor() {
141+
return backgroundColor;
142+
}
143+
144+
public void setBackgroundColor(String backgroundColor) {
145+
this.backgroundColor = backgroundColor;
146+
}
147+
148+
public CadLoadOptions drawType(DrawTypeEnum drawType) {
149+
this.drawType = drawType;
150+
return this;
151+
}
152+
153+
/**
154+
* Gets or sets type of drawing.
155+
* @return drawType
156+
**/
157+
@ApiModelProperty(required = true, value = "Gets or sets type of drawing.")
158+
public DrawTypeEnum getDrawType() {
159+
return drawType;
160+
}
161+
162+
public void setDrawType(DrawTypeEnum drawType) {
163+
this.drawType = drawType;
164+
}
165+
119166

120167
@Override
121168
public boolean equals(java.lang.Object o) {
@@ -126,15 +173,15 @@ public boolean equals(java.lang.Object o) {
126173
return false;
127174
}
128175
CadLoadOptions cadLoadOptions = (CadLoadOptions) o;
129-
return Objects.equals(this.width, cadLoadOptions.width) &&
130-
Objects.equals(this.height, cadLoadOptions.height) &&
131-
Objects.equals(this.layoutNames, cadLoadOptions.layoutNames) &&
176+
return Objects.equals(this.layoutNames, cadLoadOptions.layoutNames) &&
177+
Objects.equals(this.backgroundColor, cadLoadOptions.backgroundColor) &&
178+
Objects.equals(this.drawType, cadLoadOptions.drawType) &&
132179
super.equals(o);
133180
}
134181

135182
@Override
136183
public int hashCode() {
137-
return Objects.hash(width, height, layoutNames, super.hashCode());
184+
return Objects.hash(layoutNames, backgroundColor, drawType, super.hashCode());
138185
}
139186

140187

@@ -143,9 +190,9 @@ public String toString() {
143190
StringBuilder sb = new StringBuilder();
144191
sb.append("class CadLoadOptions {\n");
145192
sb.append(" ").append(toIndentedString(super.toString())).append("\n");
146-
sb.append(" width: ").append(toIndentedString(width)).append("\n");
147-
sb.append(" height: ").append(toIndentedString(height)).append("\n");
148193
sb.append(" layoutNames: ").append(toIndentedString(layoutNames)).append("\n");
194+
sb.append(" backgroundColor: ").append(toIndentedString(backgroundColor)).append("\n");
195+
sb.append(" drawType: ").append(toIndentedString(drawType)).append("\n");
149196
sb.append("}");
150197
return sb.toString();
151198
}
Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
/**
2+
* --------------------------------------------------------------------------------------------------------------------
3+
* <copyright company="Aspose Pty Ltd" file="Cf2LoadOptions.java">
4+
* Copyright (c) 2003-2024 Aspose Pty Ltd
5+
* </copyright>
6+
* <summary>
7+
* Permission is hereby granted, free of charge, to any person obtaining a copy
8+
* of this software and associated documentation files (the "Software"), to deal
9+
* in the Software without restriction, including without limitation the rights
10+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
11+
* copies of the Software, and to permit persons to whom the Software is
12+
* furnished to do so, subject to the following conditions:
13+
*
14+
* The above copyright notice and this permission notice shall be included in all
15+
* copies or substantial portions of the Software.
16+
*
17+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
20+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
21+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
22+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
23+
* SOFTWARE.
24+
* </summary>
25+
* --------------------------------------------------------------------------------------------------------------------
26+
*/
27+
28+
package com.groupdocs.cloud.conversion.model;
29+
30+
import java.util.Objects;
31+
import com.groupdocs.cloud.conversion.model.CadLoadOptions;
32+
import io.swagger.annotations.ApiModel;
33+
import java.util.List;
34+
35+
/**
36+
* Cf2 load options
37+
*/
38+
@ApiModel(description = "Cf2 load options")
39+
public class Cf2LoadOptions extends CadLoadOptions {
40+
41+
@Override
42+
public boolean equals(java.lang.Object o) {
43+
if (this == o) {
44+
return true;
45+
}
46+
if (o == null || getClass() != o.getClass()) {
47+
return false;
48+
}
49+
return super.equals(o);
50+
}
51+
52+
@Override
53+
public int hashCode() {
54+
return Objects.hash(super.hashCode());
55+
}
56+
57+
58+
@Override
59+
public String toString() {
60+
StringBuilder sb = new StringBuilder();
61+
sb.append("class Cf2LoadOptions {\n");
62+
sb.append(" ").append(toIndentedString(super.toString())).append("\n");
63+
sb.append("}");
64+
return sb.toString();
65+
}
66+
67+
/**
68+
* Convert the given object to string with each line indented by 4 spaces
69+
* (except the first line).
70+
*/
71+
private String toIndentedString(java.lang.Object o) {
72+
if (o == null) {
73+
return "null";
74+
}
75+
return o.toString().replace("\n", "\n ");
76+
}
77+
78+
}
79+
Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
/**
2+
* --------------------------------------------------------------------------------------------------------------------
3+
* <copyright company="Aspose Pty Ltd" file="DwfxLoadOptions.java">
4+
* Copyright (c) 2003-2024 Aspose Pty Ltd
5+
* </copyright>
6+
* <summary>
7+
* Permission is hereby granted, free of charge, to any person obtaining a copy
8+
* of this software and associated documentation files (the "Software"), to deal
9+
* in the Software without restriction, including without limitation the rights
10+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
11+
* copies of the Software, and to permit persons to whom the Software is
12+
* furnished to do so, subject to the following conditions:
13+
*
14+
* The above copyright notice and this permission notice shall be included in all
15+
* copies or substantial portions of the Software.
16+
*
17+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
20+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
21+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
22+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
23+
* SOFTWARE.
24+
* </summary>
25+
* --------------------------------------------------------------------------------------------------------------------
26+
*/
27+
28+
package com.groupdocs.cloud.conversion.model;
29+
30+
import java.util.Objects;
31+
import com.groupdocs.cloud.conversion.model.CadLoadOptions;
32+
import io.swagger.annotations.ApiModel;
33+
import java.util.List;
34+
35+
/**
36+
* Dwfx load options
37+
*/
38+
@ApiModel(description = "Dwfx load options")
39+
public class DwfxLoadOptions extends CadLoadOptions {
40+
41+
@Override
42+
public boolean equals(java.lang.Object o) {
43+
if (this == o) {
44+
return true;
45+
}
46+
if (o == null || getClass() != o.getClass()) {
47+
return false;
48+
}
49+
return super.equals(o);
50+
}
51+
52+
@Override
53+
public int hashCode() {
54+
return Objects.hash(super.hashCode());
55+
}
56+
57+
58+
@Override
59+
public String toString() {
60+
StringBuilder sb = new StringBuilder();
61+
sb.append("class DwfxLoadOptions {\n");
62+
sb.append(" ").append(toIndentedString(super.toString())).append("\n");
63+
sb.append("}");
64+
return sb.toString();
65+
}
66+
67+
/**
68+
* Convert the given object to string with each line indented by 4 spaces
69+
* (except the first line).
70+
*/
71+
private String toIndentedString(java.lang.Object o) {
72+
if (o == null) {
73+
return "null";
74+
}
75+
return o.toString().replace("\n", "\n ");
76+
}
77+
78+
}
79+

0 commit comments

Comments
 (0)