Skip to content

Commit 1c6087d

Browse files
committed
Address further feedback, correct nonnull Halodto.
1 parent 08eea21 commit 1c6087d

2 files changed

Lines changed: 6 additions & 7 deletions

File tree

messages/src/main/proto/data_transfer_objects.proto

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ message LightDto {
101101
}
102102

103103
message HaloDto {
104-
google.protobuf.StringValue id = 1;
105-
google.protobuf.StringValue name = 2;
104+
string id = 1;
105+
string name = 2;
106106
bool gm_only = 3;
107107
bool owner_only = 4;
108108
bool inner = 5;

src/main/java/net/rptools/maptool/model/Halo.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
package net.rptools.maptool.model;
1616

1717
import com.google.common.collect.ImmutableList;
18-
import com.google.protobuf.StringValue;
1918
import java.io.Serial;
2019
import java.io.Serializable;
2120
import java.util.*;
@@ -173,8 +172,8 @@ public String toString() {
173172

174173
public static @Nonnull Halo fromDto(@Nonnull HaloDto dto) {
175174
return new Halo(
176-
GUID.valueOf(dto.getId().getValue()),
177-
dto.getName().getValue(),
175+
GUID.valueOf(dto.getId()),
176+
dto.getName(),
178177
dto.getGmOnly(),
179178
dto.getOwnerOnly(),
180179
dto.getInner(),
@@ -188,8 +187,8 @@ public String toString() {
188187

189188
public @Nonnull HaloDto toDto() {
190189
var dto = HaloDto.newBuilder();
191-
dto.setId(StringValue.of(id.toString()));
192-
dto.setName(StringValue.of(name));
190+
dto.setId(id.toString());
191+
dto.setName(name);
193192
dto.setGmOnly(gmOnly);
194193
dto.setOwnerOnly(ownerOnly);
195194
dto.setInner(inner);

0 commit comments

Comments
 (0)