Skip to content

Commit a305de2

Browse files
oldergodoldergod
committed
Regerate java...
1 parent 714e30c commit a305de2

File tree

174 files changed

+580
-218
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

174 files changed

+580
-218
lines changed

‎wire-golden-files/build.gradle.kts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ wire {
2828
boxOneOfsMinSize = 1
2929
}
3030

31+
java {
32+
includes = listOf("squareup.java.*")
33+
out = "src/main/java"
34+
}
35+
3136
kotlin {
3237
out = "src/main/kotlin"
3338
}

‎wire-golden-files/src/main/java/squareup/java/dinosaurs/Dinosaur.java‎

Lines changed: 264 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,264 @@
1+
// Code generated by Wire protocol buffer compiler, do not edit.
2+
// Source: squareup.java.dinosaurs.Dinosaur in squareup/wire/java/dinosaurs/dinosaur.proto
3+
package squareup.java.dinosaurs;
4+
5+
import com.squareup.wire.FieldEncoding;
6+
import com.squareup.wire.Message;
7+
import com.squareup.wire.ProtoAdapter;
8+
import com.squareup.wire.ProtoReader;
9+
import com.squareup.wire.ProtoWriter;
10+
import com.squareup.wire.ReverseProtoWriter;
11+
import com.squareup.wire.Syntax;
12+
import com.squareup.wire.WireField;
13+
import com.squareup.wire.internal.Internal;
14+
import java.io.IOException;
15+
import java.lang.Double;
16+
import java.lang.Object;
17+
import java.lang.Override;
18+
import java.lang.String;
19+
import java.lang.StringBuilder;
20+
import java.util.List;
21+
import okio.ByteString;
22+
import squareup.java.geology.Period;
23+
24+
public final class Dinosaur extends Message<Dinosaur, Dinosaur.Builder> {
25+
public static final ProtoAdapter<Dinosaur> ADAPTER = new ProtoAdapter_Dinosaur();
26+
27+
private static final long serialVersionUID = 0L;
28+
29+
public static final String DEFAULT_NAME = "";
30+
31+
public static final Double DEFAULT_LENGTH_METERS = 0.0d;
32+
33+
public static final Double DEFAULT_MASS_KILOGRAMS = 0.0d;
34+
35+
public static final Period DEFAULT_PERIOD = Period.CRETACEOUS;
36+
37+
/**
38+
* Common name of this dinosaur, like "Stegosaurus".
39+
*/
40+
@WireField(
41+
tag = 1,
42+
adapter = "com.squareup.wire.ProtoAdapter#STRING"
43+
)
44+
public final String name;
45+
46+
/**
47+
* URLs with images of this dinosaur.
48+
*/
49+
@WireField(
50+
tag = 2,
51+
adapter = "com.squareup.wire.ProtoAdapter#STRING",
52+
label = WireField.Label.REPEATED
53+
)
54+
public final List<String> picture_urls;
55+
56+
@WireField(
57+
tag = 3,
58+
adapter = "com.squareup.wire.ProtoAdapter#DOUBLE"
59+
)
60+
public final Double length_meters;
61+
62+
@WireField(
63+
tag = 4,
64+
adapter = "com.squareup.wire.ProtoAdapter#DOUBLE"
65+
)
66+
public final Double mass_kilograms;
67+
68+
@WireField(
69+
tag = 5,
70+
adapter = "squareup.java.geology.Period#ADAPTER"
71+
)
72+
public final Period period;
73+
74+
public Dinosaur(String name, List<String> picture_urls, Double length_meters,
75+
Double mass_kilograms, Period period) {
76+
this(name, picture_urls, length_meters, mass_kilograms, period, ByteString.EMPTY);
77+
}
78+
79+
public Dinosaur(String name, List<String> picture_urls, Double length_meters,
80+
Double mass_kilograms, Period period, ByteString unknownFields) {
81+
super(ADAPTER, unknownFields);
82+
this.name = name;
83+
this.picture_urls = Internal.immutableCopyOf("picture_urls", picture_urls);
84+
this.length_meters = length_meters;
85+
this.mass_kilograms = mass_kilograms;
86+
this.period = period;
87+
}
88+
89+
@Override
90+
public Builder newBuilder() {
91+
Builder builder = new Builder();
92+
builder.name = name;
93+
builder.picture_urls = Internal.copyOf(picture_urls);
94+
builder.length_meters = length_meters;
95+
builder.mass_kilograms = mass_kilograms;
96+
builder.period = period;
97+
builder.addUnknownFields(unknownFields());
98+
return builder;
99+
}
100+
101+
@Override
102+
public boolean equals(Object other) {
103+
if (other == this) return true;
104+
if (!(other instanceof Dinosaur)) return false;
105+
Dinosaur o = (Dinosaur) other;
106+
return unknownFields().equals(o.unknownFields())
107+
&& Internal.equals(name, o.name)
108+
&& picture_urls.equals(o.picture_urls)
109+
&& Internal.equals(length_meters, o.length_meters)
110+
&& Internal.equals(mass_kilograms, o.mass_kilograms)
111+
&& Internal.equals(period, o.period);
112+
}
113+
114+
@Override
115+
public int hashCode() {
116+
int result = super.hashCode;
117+
if (result == 0) {
118+
result = unknownFields().hashCode();
119+
result = result * 37 + (name != null ? name.hashCode() : 0);
120+
result = result * 37 + picture_urls.hashCode();
121+
result = result * 37 + (length_meters != null ? length_meters.hashCode() : 0);
122+
result = result * 37 + (mass_kilograms != null ? mass_kilograms.hashCode() : 0);
123+
result = result * 37 + (period != null ? period.hashCode() : 0);
124+
super.hashCode = result;
125+
}
126+
return result;
127+
}
128+
129+
@Override
130+
public String toString() {
131+
StringBuilder builder = new StringBuilder();
132+
if (name != null) builder.append(", name=").append(Internal.sanitize(name));
133+
if (!picture_urls.isEmpty()) builder.append(", picture_urls=").append(Internal.sanitize(picture_urls));
134+
if (length_meters != null) builder.append(", length_meters=").append(length_meters);
135+
if (mass_kilograms != null) builder.append(", mass_kilograms=").append(mass_kilograms);
136+
if (period != null) builder.append(", period=").append(period);
137+
return builder.replace(0, 2, "Dinosaur{").append('}').toString();
138+
}
139+
140+
public static final class Builder extends Message.Builder<Dinosaur, Builder> {
141+
public String name;
142+
143+
public List<String> picture_urls;
144+
145+
public Double length_meters;
146+
147+
public Double mass_kilograms;
148+
149+
public Period period;
150+
151+
public Builder() {
152+
picture_urls = Internal.newMutableList();
153+
}
154+
155+
/**
156+
* Common name of this dinosaur, like "Stegosaurus".
157+
*/
158+
public Builder name(String name) {
159+
this.name = name;
160+
return this;
161+
}
162+
163+
/**
164+
* URLs with images of this dinosaur.
165+
*/
166+
public Builder picture_urls(List<String> picture_urls) {
167+
Internal.checkElementsNotNull(picture_urls);
168+
this.picture_urls = picture_urls;
169+
return this;
170+
}
171+
172+
public Builder length_meters(Double length_meters) {
173+
this.length_meters = length_meters;
174+
return this;
175+
}
176+
177+
public Builder mass_kilograms(Double mass_kilograms) {
178+
this.mass_kilograms = mass_kilograms;
179+
return this;
180+
}
181+
182+
public Builder period(Period period) {
183+
this.period = period;
184+
return this;
185+
}
186+
187+
@Override
188+
public Dinosaur build() {
189+
return new Dinosaur(name, picture_urls, length_meters, mass_kilograms, period, super.buildUnknownFields());
190+
}
191+
}
192+
193+
private static final class ProtoAdapter_Dinosaur extends ProtoAdapter<Dinosaur> {
194+
public ProtoAdapter_Dinosaur() {
195+
super(FieldEncoding.LENGTH_DELIMITED, Dinosaur.class, "type.googleapis.com/squareup.java.dinosaurs.Dinosaur", Syntax.PROTO_2.INSTANCE, null, "squareup/wire/java/dinosaurs/dinosaur.proto");
196+
}
197+
198+
@Override
199+
public int encodedSize(Dinosaur value) {
200+
int result = 0;
201+
result += ProtoAdapter.STRING.encodedSizeWithTag(1, value.name);
202+
result += ProtoAdapter.STRING.asRepeated().encodedSizeWithTag(2, value.picture_urls);
203+
result += ProtoAdapter.DOUBLE.encodedSizeWithTag(3, value.length_meters);
204+
result += ProtoAdapter.DOUBLE.encodedSizeWithTag(4, value.mass_kilograms);
205+
result += Period.ADAPTER.encodedSizeWithTag(5, value.period);
206+
result += value.unknownFields().size();
207+
return result;
208+
}
209+
210+
@Override
211+
public void encode(ProtoWriter writer, Dinosaur value) throws IOException {
212+
ProtoAdapter.STRING.encodeWithTag(writer, 1, value.name);
213+
ProtoAdapter.STRING.asRepeated().encodeWithTag(writer, 2, value.picture_urls);
214+
ProtoAdapter.DOUBLE.encodeWithTag(writer, 3, value.length_meters);
215+
ProtoAdapter.DOUBLE.encodeWithTag(writer, 4, value.mass_kilograms);
216+
Period.ADAPTER.encodeWithTag(writer, 5, value.period);
217+
writer.writeBytes(value.unknownFields());
218+
}
219+
220+
@Override
221+
public void encode(ReverseProtoWriter writer, Dinosaur value) throws IOException {
222+
writer.writeBytes(value.unknownFields());
223+
Period.ADAPTER.encodeWithTag(writer, 5, value.period);
224+
ProtoAdapter.DOUBLE.encodeWithTag(writer, 4, value.mass_kilograms);
225+
ProtoAdapter.DOUBLE.encodeWithTag(writer, 3, value.length_meters);
226+
ProtoAdapter.STRING.asRepeated().encodeWithTag(writer, 2, value.picture_urls);
227+
ProtoAdapter.STRING.encodeWithTag(writer, 1, value.name);
228+
}
229+
230+
@Override
231+
public Dinosaur decode(ProtoReader reader) throws IOException {
232+
Builder builder = new Builder();
233+
long token = reader.beginMessage();
234+
for (int tag; (tag = reader.nextTag()) != -1;) {
235+
switch (tag) {
236+
case 1: builder.name(ProtoAdapter.STRING.decode(reader)); break;
237+
case 2: builder.picture_urls.add(ProtoAdapter.STRING.decode(reader)); break;
238+
case 3: builder.length_meters(ProtoAdapter.DOUBLE.decode(reader)); break;
239+
case 4: builder.mass_kilograms(ProtoAdapter.DOUBLE.decode(reader)); break;
240+
case 5: {
241+
try {
242+
builder.period(Period.ADAPTER.decode(reader));
243+
} catch (ProtoAdapter.EnumConstantNotFoundException e) {
244+
builder.addUnknownField(tag, FieldEncoding.VARINT, (long) e.value);
245+
}
246+
break;
247+
}
248+
default: {
249+
reader.readUnknownField(tag);
250+
}
251+
}
252+
}
253+
builder.addUnknownFields(reader.endMessageAndGetUnknownFields(token));
254+
return builder.build();
255+
}
256+
257+
@Override
258+
public Dinosaur redact(Dinosaur value) {
259+
Builder builder = value.newBuilder();
260+
builder.clearUnknownFields();
261+
return builder.build();
262+
}
263+
}
264+
}

‎wire-golden-files/src/main/java/squareup/java/geology/Period.java‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
// Code generated by Wire protocol buffer compiler, do not edit.
2+
// Source: squareup.java.geology.Period in squareup/wire/java/geology/period.proto
3+
package squareup.java.geology;
4+
5+
import com.squareup.wire.EnumAdapter;
6+
import com.squareup.wire.ProtoAdapter;
7+
import com.squareup.wire.Syntax;
8+
import com.squareup.wire.WireEnum;
9+
import java.lang.Override;
10+
11+
public enum Period implements WireEnum {
12+
/**
13+
* 145.5 million years ago — 66.0 million years ago.
14+
*/
15+
CRETACEOUS(1),
16+
17+
/**
18+
* 201.3 million years ago — 145.0 million years ago.
19+
*/
20+
JURASSIC(2),
21+
22+
/**
23+
* 252.17 million years ago — 201.3 million years ago.
24+
*/
25+
TRIASSIC(3);
26+
27+
public static final ProtoAdapter<Period> ADAPTER = new ProtoAdapter_Period();
28+
29+
private final int value;
30+
31+
Period(int value) {
32+
this.value = value;
33+
}
34+
35+
/**
36+
* Return the constant for {@code value} or null.
37+
*/
38+
public static Period fromValue(int value) {
39+
switch (value) {
40+
case 1: return CRETACEOUS;
41+
case 2: return JURASSIC;
42+
case 3: return TRIASSIC;
43+
default: return null;
44+
}
45+
}
46+
47+
@Override
48+
public int getValue() {
49+
return value;
50+
}
51+
52+
private static final class ProtoAdapter_Period extends EnumAdapter<Period> {
53+
ProtoAdapter_Period() {
54+
super(Period.class, Syntax.PROTO_2.INSTANCE, null);
55+
}
56+
57+
@Override
58+
protected Period fromValue(int value) {
59+
return Period.fromValue(value);
60+
}
61+
}
62+
}

‎wire-golden-files/src/main/proto/squareup/wire/java/dinosaurs/dinosaur.proto‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
syntax = "proto2";
2+
3+
package squareup.java.dinosaurs;
4+
5+
import "squareup/wire/java/geology/period.proto";
6+
7+
message Dinosaur {
8+
/** Common name of this dinosaur, like "Stegosaurus". */
9+
optional string name = 1;
10+
11+
/** URLs with images of this dinosaur. */
12+
repeated string picture_urls = 2;
13+
14+
optional double length_meters = 3;
15+
optional double mass_kilograms = 4;
16+
optional squareup.java.geology.Period period = 5;
17+
}

‎wire-golden-files/src/main/proto/squareup/wire/java/geology/period.proto‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
syntax = "proto2";
2+
3+
package squareup.java.geology;
4+
5+
enum Period {
6+
/** 145.5 million years ago — 66.0 million years ago. */
7+
CRETACEOUS = 1;
8+
9+
/** 201.3 million years ago — 145.0 million years ago. */
10+
JURASSIC = 2;
11+
12+
/** 252.17 million years ago — 201.3 million years ago. */
13+
TRIASSIC = 3;
14+
}

‎wire-gson-support/src/test/java/com/squareup/wire/proto2/RepeatedPackedAndMap.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ private static final class ProtoAdapter_RepeatedPackedAndMap extends ProtoAdapte
144144
private ProtoAdapter<Map<Integer, Integer>> map_int32_int32;
145145

146146
public ProtoAdapter_RepeatedPackedAndMap() {
147-
super(FieldEncoding.LENGTH_DELIMITED, RepeatedPackedAndMap.class, "type.googleapis.com/squareup.proto2.alltypes.RepeatedPackedAndMap", Syntax.PROTO_2, null, "collection_types.proto");
147+
super(FieldEncoding.LENGTH_DELIMITED, RepeatedPackedAndMap.class, "type.googleapis.com/squareup.proto2.alltypes.RepeatedPackedAndMap", Syntax.PROTO_2.INSTANCE, null, "collection_types.proto");
148148
}
149149

150150
@Override

‎wire-gson-support/src/test/java/com/squareup/wire/proto2/alltypes/AllTypes.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import okio.ByteString;
2222

2323
public final class AllTypes extends Message<AllTypes, AllTypes.Builder> {
24-
public static final ProtoAdapter<AllTypes> ADAPTER = ProtoAdapter.newMessageAdapter(AllTypes.class, "type.googleapis.com/squareup.proto2.AllTypes", Syntax.PROTO_2);
24+
public static final ProtoAdapter<AllTypes> ADAPTER = ProtoAdapter.newMessageAdapter(AllTypes.class, "type.googleapis.com/squareup.proto2.AllTypes", Syntax.PROTO_2.INSTANCE);
2525

2626
private static final long serialVersionUID = 0L;
2727

@@ -2946,7 +2946,7 @@ public int getValue() {
29462946
}
29472947

29482948
public static final class NestedMessage extends Message<NestedMessage, NestedMessage.Builder> {
2949-
public static final ProtoAdapter<NestedMessage> ADAPTER = ProtoAdapter.newMessageAdapter(NestedMessage.class, "type.googleapis.com/squareup.proto2.AllTypes.NestedMessage", Syntax.PROTO_2);
2949+
public static final ProtoAdapter<NestedMessage> ADAPTER = ProtoAdapter.newMessageAdapter(NestedMessage.class, "type.googleapis.com/squareup.proto2.AllTypes.NestedMessage", Syntax.PROTO_2.INSTANCE);
29502950

29512951
private static final long serialVersionUID = 0L;
29522952

0 commit comments

Comments
 (0)