Skip to content
This repository was archived by the owner on May 25, 2021. It is now read-only.

Fixed issue across API when generating JSON. Previously, if an attrib… #7

Draft
michaelfclarke wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Fixed issue across API when generating JSON. Previously, if an attrib… #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,21 @@
<version>${junit.vintage.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<version>8.0.30</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<version>8.0.30</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<version>8.0.30</version>
</dependency>
</dependencies>
<properties>
<java.version>1.8</java.version>
Expand Down
6 changes: 5 additions & 1 deletion src/main/java/com/upcloud/client/models/AddressFamily.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,11 @@ public static AddressFamily fromValue(String text) {
public static class Adapter extends TypeAdapter<AddressFamily> {
@Override
public void write(final JsonWriter jsonWriter, final AddressFamily enumeration) throws IOException {
jsonWriter.value(enumeration.getValue());
if (enumeration != null) {
jsonWriter.value(enumeration.getValue());
} else {
jsonWriter.nullValue();
}
}

@Override
Expand Down
6 changes: 5 additions & 1 deletion src/main/java/com/upcloud/client/models/BackupRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,11 @@ public static IntervalEnum fromValue(String text) {
public static class Adapter extends TypeAdapter<IntervalEnum> {
@Override
public void write(final JsonWriter jsonWriter, final IntervalEnum enumeration) throws IOException {
jsonWriter.value(enumeration.getValue());
if (enumeration != null) {
jsonWriter.value(enumeration.getValue());
} else {
jsonWriter.nullValue();
}
}

@Override
Expand Down
6 changes: 5 additions & 1 deletion src/main/java/com/upcloud/client/models/ErrorCode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,11 @@ public static ErrorCode fromValue(String text) {
public static class Adapter extends TypeAdapter<ErrorCode> {
@Override
public void write(final JsonWriter jsonWriter, final ErrorCode enumeration) throws IOException {
jsonWriter.value(enumeration.getValue());
if (enumeration != null) {
jsonWriter.value(enumeration.getValue());
} else {
jsonWriter.nullValue();
}
}

@Override
Expand Down
6 changes: 5 additions & 1 deletion src/main/java/com/upcloud/client/models/ErrorStatus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,11 @@ public static ErrorStatus fromValue(String text) {
public static class Adapter extends TypeAdapter<ErrorStatus> {
@Override
public void write(final JsonWriter jsonWriter, final ErrorStatus enumeration) throws IOException {
jsonWriter.value(enumeration.getValue());
if (enumeration != null) {
jsonWriter.value(enumeration.getValue());
} else {
jsonWriter.nullValue();
}
}

@Override
Expand Down
20 changes: 16 additions & 4 deletions src/main/java/com/upcloud/client/models/FirewallRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,11 @@ public static DirectionEnum fromValue(String text) {
public static class Adapter extends TypeAdapter<DirectionEnum> {
@Override
public void write(final JsonWriter jsonWriter, final DirectionEnum enumeration) throws IOException {
jsonWriter.value(enumeration.getValue());
if (enumeration != null) {
jsonWriter.value(enumeration.getValue());
} else {
jsonWriter.nullValue();
}
}

@Override
Expand All @@ -84,7 +88,7 @@ public enum ActionEnum {
ACCEPT("accept"),

REJECT("reject"),

DROP("drop");

private String value;
Expand Down Expand Up @@ -114,7 +118,11 @@ public static ActionEnum fromValue(String text) {
public static class Adapter extends TypeAdapter<ActionEnum> {
@Override
public void write(final JsonWriter jsonWriter, final ActionEnum enumeration) throws IOException {
jsonWriter.value(enumeration.getValue());
if (enumeration != null) {
jsonWriter.value(enumeration.getValue());
} else {
jsonWriter.nullValue();
}
}

@Override
Expand Down Expand Up @@ -172,7 +180,11 @@ public static ProtocolEnum fromValue(String text) {
public static class Adapter extends TypeAdapter<ProtocolEnum> {
@Override
public void write(final JsonWriter jsonWriter, final ProtocolEnum enumeration) throws IOException {
jsonWriter.value(enumeration.getValue());
if (enumeration != null) {
jsonWriter.value(enumeration.getValue());
} else {
jsonWriter.nullValue();
}
}

@Override
Expand Down
18 changes: 15 additions & 3 deletions src/main/java/com/upcloud/client/models/IpAddress.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,11 @@ public static AccessEnum fromValue(String text) {
public static class Adapter extends TypeAdapter<AccessEnum> {
@Override
public void write(final JsonWriter jsonWriter, final AccessEnum enumeration) throws IOException {
jsonWriter.value(enumeration.getValue());
if (enumeration != null) {
jsonWriter.value(enumeration.getValue());
} else {
jsonWriter.nullValue();
}
}

@Override
Expand Down Expand Up @@ -115,7 +119,11 @@ public static FamilyEnum fromValue(String text) {
public static class Adapter extends TypeAdapter<FamilyEnum> {
@Override
public void write(final JsonWriter jsonWriter, final FamilyEnum enumeration) throws IOException {
jsonWriter.value(enumeration.getValue());
if (enumeration != null) {
jsonWriter.value(enumeration.getValue());
} else {
jsonWriter.nullValue();
}
}

@Override
Expand Down Expand Up @@ -171,7 +179,11 @@ public static PartOfPlanEnum fromValue(String text) {
public static class Adapter extends TypeAdapter<PartOfPlanEnum> {
@Override
public void write(final JsonWriter jsonWriter, final PartOfPlanEnum enumeration) throws IOException {
jsonWriter.value(enumeration.getValue());
if (enumeration != null) {
jsonWriter.value(enumeration.getValue());
} else {
jsonWriter.nullValue();
}
}

@Override
Expand Down
12 changes: 10 additions & 2 deletions src/main/java/com/upcloud/client/models/RestartServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,11 @@ public static StopTypeEnum fromValue(String text) {
public static class Adapter extends TypeAdapter<StopTypeEnum> {
@Override
public void write(final JsonWriter jsonWriter, final StopTypeEnum enumeration) throws IOException {
jsonWriter.value(enumeration.getValue());
if (enumeration != null) {
jsonWriter.value(enumeration.getValue());
} else {
jsonWriter.nullValue();
}
}

@Override
Expand Down Expand Up @@ -114,7 +118,11 @@ public static TimeoutActionEnum fromValue(String text) {
public static class Adapter extends TypeAdapter<TimeoutActionEnum> {
@Override
public void write(final JsonWriter jsonWriter, final TimeoutActionEnum enumeration) throws IOException {
jsonWriter.value(enumeration.getValue());
if (enumeration != null) {
jsonWriter.value(enumeration.getValue());
} else {
jsonWriter.nullValue();
}
}

@Override
Expand Down
30 changes: 25 additions & 5 deletions src/main/java/com/upcloud/client/models/Server.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,11 @@ public static BootOrderEnum fromValue(String text) {
public static class Adapter extends TypeAdapter<BootOrderEnum> {
@Override
public void write(final JsonWriter jsonWriter, final BootOrderEnum enumeration) throws IOException {
jsonWriter.value(enumeration.getValue());
if (enumeration != null) {
jsonWriter.value(enumeration.getValue());
} else {
jsonWriter.nullValue();
}
}

@Override
Expand Down Expand Up @@ -124,7 +128,11 @@ public static FirewallEnum fromValue(String text) {
public static class Adapter extends TypeAdapter<FirewallEnum> {
@Override
public void write(final JsonWriter jsonWriter, final FirewallEnum enumeration) throws IOException {
jsonWriter.value(enumeration.getValue());
if (enumeration != null) {
jsonWriter.value(enumeration.getValue());
} else {
jsonWriter.nullValue();
}
}

@Override
Expand Down Expand Up @@ -219,7 +227,11 @@ public static VideoModelEnum fromValue(String text) {
public static class Adapter extends TypeAdapter<VideoModelEnum> {
@Override
public void write(final JsonWriter jsonWriter, final VideoModelEnum enumeration) throws IOException {
jsonWriter.value(enumeration.getValue());
if (enumeration != null) {
jsonWriter.value(enumeration.getValue());
} else {
jsonWriter.nullValue();
}
}

@Override
Expand Down Expand Up @@ -269,7 +281,11 @@ public static VncEnum fromValue(String text) {
public static class Adapter extends TypeAdapter<VncEnum> {
@Override
public void write(final JsonWriter jsonWriter, final VncEnum enumeration) throws IOException {
jsonWriter.value(enumeration.getValue());
if (enumeration != null) {
jsonWriter.value(enumeration.getValue());
} else {
jsonWriter.nullValue();
}
}

@Override
Expand Down Expand Up @@ -333,7 +349,11 @@ public static PasswordDeliveryEnum fromValue(String text) {
public static class Adapter extends TypeAdapter<PasswordDeliveryEnum> {
@Override
public void write(final JsonWriter jsonWriter, final PasswordDeliveryEnum enumeration) throws IOException {
jsonWriter.value(enumeration.getValue());
if (enumeration != null) {
jsonWriter.value(enumeration.getValue());
} else {
jsonWriter.nullValue();
}
}

@Override
Expand Down
6 changes: 5 additions & 1 deletion src/main/java/com/upcloud/client/models/ServerState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,11 @@ public static ServerState fromValue(String text) {
public static class Adapter extends TypeAdapter<ServerState> {
@Override
public void write(final JsonWriter jsonWriter, final ServerState enumeration) throws IOException {
jsonWriter.value(enumeration.getValue());
if (enumeration != null) {
jsonWriter.value(enumeration.getValue());
} else {
jsonWriter.nullValue();
}
}

@Override
Expand Down
6 changes: 5 additions & 1 deletion src/main/java/com/upcloud/client/models/StopServerRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,11 @@ public static StopTypeEnum fromValue(String text) {
public static class Adapter extends TypeAdapter<StopTypeEnum> {
@Override
public void write(final JsonWriter jsonWriter, final StopTypeEnum enumeration) throws IOException {
jsonWriter.value(enumeration.getValue());
if (enumeration != null) {
jsonWriter.value(enumeration.getValue());
} else {
jsonWriter.nullValue();
}
}

@Override
Expand Down
6 changes: 5 additions & 1 deletion src/main/java/com/upcloud/client/models/StorageAccessType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,11 @@ public static StorageAccessType fromValue(String text) {
public static class Adapter extends TypeAdapter<StorageAccessType> {
@Override
public void write(final JsonWriter jsonWriter, final StorageAccessType enumeration) throws IOException {
jsonWriter.value(enumeration.getValue());
if (enumeration != null) {
jsonWriter.value(enumeration.getValue());
} else {
jsonWriter.nullValue();
}
}

@Override
Expand Down
6 changes: 5 additions & 1 deletion src/main/java/com/upcloud/client/models/StorageDevice.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,11 @@ public static PartOfPlanEnum fromValue(String text) {
public static class Adapter extends TypeAdapter<PartOfPlanEnum> {
@Override
public void write(final JsonWriter jsonWriter, final PartOfPlanEnum enumeration) throws IOException {
jsonWriter.value(enumeration.getValue());
if (enumeration != null) {
jsonWriter.value(enumeration.getValue());
} else {
jsonWriter.nullValue();
}
}

@Override
Expand Down
6 changes: 5 additions & 1 deletion src/main/java/com/upcloud/client/models/StorageState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,11 @@ public static StorageState fromValue(String text) {
public static class Adapter extends TypeAdapter<StorageState> {
@Override
public void write(final JsonWriter jsonWriter, final StorageState enumeration) throws IOException {
jsonWriter.value(enumeration.getValue());
if (enumeration != null) {
jsonWriter.value(enumeration.getValue());
} else {
jsonWriter.nullValue();
}
}

@Override
Expand Down
6 changes: 5 additions & 1 deletion src/main/java/com/upcloud/client/models/StorageTier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,11 @@ public static StorageTier fromValue(String text) {
public static class Adapter extends TypeAdapter<StorageTier> {
@Override
public void write(final JsonWriter jsonWriter, final StorageTier enumeration) throws IOException {
jsonWriter.value(enumeration.getValue());
if (enumeration != null) {
jsonWriter.value(enumeration.getValue());
} else {
jsonWriter.nullValue();
}
}

@Override
Expand Down
6 changes: 5 additions & 1 deletion src/main/java/com/upcloud/client/models/StorageType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,11 @@ public static StorageType fromValue(String text) {
public static class Adapter extends TypeAdapter<StorageType> {
@Override
public void write(final JsonWriter jsonWriter, final StorageType enumeration) throws IOException {
jsonWriter.value(enumeration.getValue());
if (enumeration != null) {
jsonWriter.value(enumeration.getValue());
} else {
jsonWriter.nullValue();
}
}

@Override
Expand Down