Skip to content

Commit 9d8a4ff

Browse files
committed
Rename get* methods in JsonWireFormat for consistency.
Motivation: - Align method names with standard practices by removing the `get` prefix for boolean accessors to enhance readability and maintain consistency across the codebase. Changes: - Renamed all `get*` methods to remove the `get` prefix in `JsonWireFormat`. - Updated `ProtobufJsonWriterImpl` and `ProtobufJsonReaderImpl` to use the renamed methods. Signed-off-by: Daniel Fiala <danfiala23@gmail.com>
1 parent 594455a commit 9d8a4ff

4 files changed

Lines changed: 28 additions & 34 deletions

File tree

vertx-grpc-common/src/main/java/io/vertx/grpc/common/JsonWireFormat.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public final String name() {
9999
return NAME;
100100
}
101101

102-
public boolean getAlwaysPrintFieldsWithNoPresence() {
102+
public boolean alwaysPrintFieldsWithNoPresence() {
103103
return alwaysPrintFieldsWithNoPresence;
104104
}
105105

@@ -110,7 +110,7 @@ public JsonWireFormat alwaysPrintFieldsWithNoPresence(boolean value) {
110110
return new JsonWireFormat(value, omittingInsignificantWhitespace, preservingProtoFieldNames, printingEnumsAsInts, sortingMapKeys, ignoringUnknownFields);
111111
}
112112

113-
public boolean getOmittingInsignificantWhitespace() {
113+
public boolean omittingInsignificantWhitespace() {
114114
return omittingInsignificantWhitespace;
115115
}
116116

@@ -121,7 +121,7 @@ public JsonWireFormat omittingInsignificantWhitespace(boolean value) {
121121
return new JsonWireFormat(alwaysPrintFieldsWithNoPresence, value, preservingProtoFieldNames, printingEnumsAsInts, sortingMapKeys, ignoringUnknownFields);
122122
}
123123

124-
public boolean getPreservingProtoFieldNames() {
124+
public boolean preservingProtoFieldNames() {
125125
return preservingProtoFieldNames;
126126
}
127127

@@ -132,7 +132,7 @@ public JsonWireFormat preservingProtoFieldNames(boolean value) {
132132
return new JsonWireFormat(alwaysPrintFieldsWithNoPresence, omittingInsignificantWhitespace, value, printingEnumsAsInts, sortingMapKeys, ignoringUnknownFields);
133133
}
134134

135-
public boolean getPrintingEnumsAsInts() {
135+
public boolean printingEnumsAsInts() {
136136
return printingEnumsAsInts;
137137
}
138138

@@ -143,7 +143,7 @@ public JsonWireFormat printingEnumsAsInts(boolean value) {
143143
return new JsonWireFormat(alwaysPrintFieldsWithNoPresence, omittingInsignificantWhitespace, preservingProtoFieldNames, value, sortingMapKeys, ignoringUnknownFields);
144144
}
145145

146-
public boolean getSortingMapKeys() {
146+
public boolean sortingMapKeys() {
147147
return sortingMapKeys;
148148
}
149149

@@ -154,7 +154,7 @@ public JsonWireFormat sortingMapKeys(boolean value) {
154154
return new JsonWireFormat(alwaysPrintFieldsWithNoPresence, omittingInsignificantWhitespace, preservingProtoFieldNames, printingEnumsAsInts, value, ignoringUnknownFields);
155155
}
156156

157-
public boolean getIgnoringUnknownFields() {
157+
public boolean ignoringUnknownFields() {
158158
return ignoringUnknownFields;
159159
}
160160

vertx-grpc-common/src/main/java/io/vertx/grpc/common/impl/ProtobufJsonReaderImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public final class ProtobufJsonReaderImpl implements ProtobufJsonReader {
1616

1717
public ProtobufJsonReaderImpl(JsonWireFormat format) {
1818
JsonFormat.Parser parser = JsonFormat.parser();
19-
if (format.getIgnoringUnknownFields()) {
19+
if (format.ignoringUnknownFields()) {
2020
parser = parser.ignoringUnknownFields();
2121
}
2222
this.parser = parser;

vertx-grpc-common/src/main/java/io/vertx/grpc/common/impl/ProtobufJsonWriterImpl.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,19 @@ public final class ProtobufJsonWriterImpl implements ProtobufJsonWriter {
1414

1515
public ProtobufJsonWriterImpl(JsonWireFormat format) {
1616
JsonFormat.Printer printer = JsonFormat.printer();
17-
if (format.getAlwaysPrintFieldsWithNoPresence()) {
17+
if (format.alwaysPrintFieldsWithNoPresence()) {
1818
printer = printer.alwaysPrintFieldsWithNoPresence();
1919
}
20-
if (format.getOmittingInsignificantWhitespace()) {
20+
if (format.omittingInsignificantWhitespace()) {
2121
printer = printer.omittingInsignificantWhitespace();
2222
}
23-
if (format.getPreservingProtoFieldNames()) {
23+
if (format.preservingProtoFieldNames()) {
2424
printer = printer.preservingProtoFieldNames();
2525
}
26-
if (format.getPrintingEnumsAsInts()) {
26+
if (format.printingEnumsAsInts()) {
2727
printer = printer.printingEnumsAsInts();
2828
}
29-
if (format.getSortingMapKeys()) {
29+
if (format.sortingMapKeys()) {
3030
printer = printer.sortingMapKeys();
3131
}
3232
this.printer = printer;

vertx-grpc-common/src/test/java/io/vertx/tests/common/JsonWireFormatTest.java

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,41 +12,35 @@
1212

1313
public class JsonWireFormatTest {
1414

15-
@Test
16-
public void testName() {
17-
assertEquals("json", WireFormat.JSON.name());
18-
assertEquals("proto", WireFormat.PROTOBUF.name());
19-
}
20-
2115
@Test
2216
public void testDefaultFlagsAreFalse() {
2317
JsonWireFormat fmt = WireFormat.JSON;
24-
assertFalse(fmt.getAlwaysPrintFieldsWithNoPresence());
25-
assertFalse(fmt.getOmittingInsignificantWhitespace());
26-
assertFalse(fmt.getPreservingProtoFieldNames());
27-
assertFalse(fmt.getPrintingEnumsAsInts());
28-
assertFalse(fmt.getSortingMapKeys());
29-
assertFalse(fmt.getIgnoringUnknownFields());
18+
assertFalse(fmt.alwaysPrintFieldsWithNoPresence());
19+
assertFalse(fmt.omittingInsignificantWhitespace());
20+
assertFalse(fmt.preservingProtoFieldNames());
21+
assertFalse(fmt.printingEnumsAsInts());
22+
assertFalse(fmt.sortingMapKeys());
23+
assertFalse(fmt.ignoringUnknownFields());
3024
}
3125

3226
@Test
3327
public void testWriterFlagsAreImmutable() {
3428
JsonWireFormat original = WireFormat.JSON;
3529
JsonWireFormat derived = original.alwaysPrintFieldsWithNoPresence(true);
3630
assertNotSame(original, derived);
37-
assertFalse(original.getAlwaysPrintFieldsWithNoPresence());
38-
assertTrue(derived.getAlwaysPrintFieldsWithNoPresence());
39-
assertFalse(derived.getIgnoringUnknownFields());
31+
assertFalse(original.alwaysPrintFieldsWithNoPresence());
32+
assertTrue(derived.alwaysPrintFieldsWithNoPresence());
33+
assertFalse(derived.ignoringUnknownFields());
4034
}
4135

4236
@Test
4337
public void testReaderFlagsAreImmutable() {
4438
JsonWireFormat original = WireFormat.JSON;
4539
JsonWireFormat derived = original.ignoringUnknownFields(true);
4640
assertNotSame(original, derived);
47-
assertFalse(original.getIgnoringUnknownFields());
48-
assertTrue(derived.getIgnoringUnknownFields());
49-
assertFalse(derived.getAlwaysPrintFieldsWithNoPresence());
41+
assertFalse(original.ignoringUnknownFields());
42+
assertTrue(derived.ignoringUnknownFields());
43+
assertFalse(derived.alwaysPrintFieldsWithNoPresence());
5044
}
5145

5246
@Test
@@ -55,10 +49,10 @@ public void testFlagsCompose() {
5549
.alwaysPrintFieldsWithNoPresence(true)
5650
.ignoringUnknownFields(true)
5751
.printingEnumsAsInts(true);
58-
assertTrue(fmt.getAlwaysPrintFieldsWithNoPresence());
59-
assertTrue(fmt.getIgnoringUnknownFields());
60-
assertTrue(fmt.getPrintingEnumsAsInts());
61-
assertFalse(fmt.getSortingMapKeys());
52+
assertTrue(fmt.alwaysPrintFieldsWithNoPresence());
53+
assertTrue(fmt.ignoringUnknownFields());
54+
assertTrue(fmt.printingEnumsAsInts());
55+
assertFalse(fmt.sortingMapKeys());
6256
}
6357

6458
@Test

0 commit comments

Comments
 (0)