Skip to content

Commit abe001b

Browse files
dehoradehora
committed
tidy
1 parent 3d63bfa commit abe001b

32 files changed

+88
-80
lines changed

‎intercom-java/src/main/java/io/intercom/api/AdminCollection.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ public AdminCollection nextPage() {
2323
return fetchNextPage(AdminCollection.class);
2424
}
2525

26+
@SuppressWarnings("EmptyMethod")
2627
@JsonProperty("admins")
2728
@Override
2829
public List<Admin> getPageItems() {

‎intercom-java/src/main/java/io/intercom/api/AdminMessage.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
55
import com.fasterxml.jackson.annotation.JsonInclude;
66
import com.fasterxml.jackson.annotation.JsonProperty;
7+
import com.google.common.annotations.VisibleForTesting;
78

89

910
@SuppressWarnings("UnusedDeclaration")
@@ -49,6 +50,8 @@ public String getId() {
4950
return id;
5051
}
5152

53+
@SuppressWarnings("UnusedReturnValue")
54+
@VisibleForTesting
5255
AdminMessage setId(String id) {
5356
this.id = id;
5457
return this;
@@ -94,6 +97,7 @@ public long getCreatedAt() {
9497
return createdAt;
9598
}
9699

100+
@SuppressWarnings("UnusedReturnValue")
97101
public AdminMessage setCreatedAt(long createdAt) {
98102
this.createdAt = createdAt;
99103
return this;

‎intercom-java/src/main/java/io/intercom/api/AdminMessageResponse.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@
1111
@JsonInclude(JsonInclude.Include.NON_EMPTY)
1212
class AdminMessageResponse extends TypedData {
1313

14-
@JsonProperty("type")
15-
private final String type = "admin_message";
16-
1714
@JsonProperty("id")
1815
private String id;
1916

@@ -45,7 +42,7 @@ public AdminMessageResponse() {
4542
}
4643

4744
public String getType() {
48-
return type;
45+
return "admin_message";
4946
}
5047

5148
public String getId() {

‎intercom-java/src/main/java/io/intercom/api/CompanyCollection.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ public CompanyCollection(List<Company> companies) {
2525
this.pageItems = companies;
2626
}
2727

28+
@SuppressWarnings("EmptyMethod")
2829
@JsonProperty("companies")
2930
@Override
3031
public List<Company> getPageItems() {

‎intercom-java/src/main/java/io/intercom/api/CompanyStringPlan.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@
1212
@JsonIgnoreProperties(ignoreUnknown = true)
1313
class CompanyStringPlan extends TypedData {
1414

15-
@JsonProperty("type")
16-
private final String type = "company";
17-
1815
@JsonProperty("id")
1916
private String id;
2017

@@ -44,7 +41,7 @@ public CompanyStringPlan() {
4441
}
4542

4643
public String getType() {
47-
return type;
44+
return "company";
4845
}
4946

5047
public String getId() {

‎intercom-java/src/main/java/io/intercom/api/ConversationCollection.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ public ConversationCollection() {
1717
iterator = new TypedDataCollectionIterator<Conversation>(this);
1818
}
1919

20+
@SuppressWarnings("EmptyMethod")
2021
@JsonProperty("conversations")
2122
public List<Conversation> getPageItems() {
2223
return super.getPageItems();

‎intercom-java/src/main/java/io/intercom/api/ConversationPartCollection.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ public ConversationPartCollection() {
1313
type = "conversation_part.list";
1414
}
1515

16+
@SuppressWarnings("EmptyMethod")
1617
@JsonProperty("conversation_parts")
1718
public List<ConversationPart> getPageItems() {
1819
return super.getPageItems();

‎intercom-java/src/main/java/io/intercom/api/CountItemSerializer.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package io.intercom.api;
22

3-
import com.fasterxml.jackson.core.JsonGenerationException;
43
import com.fasterxml.jackson.core.JsonGenerator;
54
import com.fasterxml.jackson.databind.SerializerProvider;
65
import com.fasterxml.jackson.databind.ser.std.StdSerializer;
7-
import io.intercom.api.Counts;
86

97
import java.io.IOException;
108

@@ -16,7 +14,7 @@ public CountItemSerializer() {
1614

1715
@Override
1816
public void serialize(Counts.CountItem value, JsonGenerator jgen, SerializerProvider provider)
19-
throws IOException, JsonGenerationException {
17+
throws IOException {
2018
jgen.writeStartObject();
2119
jgen.writeNumberField(value.getName(), value.getValue());
2220
jgen.writeEndObject();

‎intercom-java/src/main/java/io/intercom/api/CustomAttribute.java‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ private StringAttribute(String name, String value) {
4141
super(name, value, String.class);
4242
}
4343

44-
private StringAttribute(String name, String value, Class<String> classt) {
45-
super(name, value, classt);
44+
private StringAttribute(String name, String value, Class<String> clazz) {
45+
super(name, value, clazz);
4646
}
4747
}
4848

@@ -52,15 +52,15 @@ private BooleanAttribute(String name, boolean value) {
5252
super(name, value, Boolean.class);
5353
}
5454

55-
private BooleanAttribute(String name, boolean value, Class<Boolean> classt) {
56-
super(name, value, classt);
55+
private BooleanAttribute(String name, boolean value, Class<Boolean> clazz) {
56+
super(name, value, clazz);
5757
}
5858
}
5959

6060
public static class DoubleAttribute extends CustomAttribute<Double> {
6161

62-
private DoubleAttribute(String name, double value, Class<Double> classt) {
63-
super(name, value, classt);
62+
private DoubleAttribute(String name, double value, Class<Double> clazz) {
63+
super(name, value, clazz);
6464
}
6565

6666
private DoubleAttribute(String name, double value) {
@@ -70,8 +70,8 @@ private DoubleAttribute(String name, double value) {
7070

7171
public static class FloatAttribute extends CustomAttribute<Float> {
7272

73-
private FloatAttribute(String name, float value, Class<Float> classt) {
74-
super(name, value, classt);
73+
private FloatAttribute(String name, float value, Class<Float> clazz) {
74+
super(name, value, clazz);
7575
}
7676

7777
private FloatAttribute(String name, float value) {
@@ -85,15 +85,15 @@ private IntegerAttribute(String name, int value) {
8585
super(name, value, Integer.class);
8686
}
8787

88-
private IntegerAttribute(String name, int value, Class<Integer> classt) {
89-
super(name, value, classt);
88+
private IntegerAttribute(String name, int value, Class<Integer> clazz) {
89+
super(name, value, clazz);
9090
}
9191
}
9292

9393
public static class LongAttribute extends CustomAttribute<Long> {
9494

95-
public LongAttribute(String name, long value, Class<Long> classt) {
96-
super(name, value, classt);
95+
public LongAttribute(String name, long value, Class<Long> clazz) {
96+
super(name, value, clazz);
9797
}
9898

9999
public LongAttribute(String name, long value) {
@@ -106,21 +106,21 @@ public LongAttribute(String name, long value) {
106106

107107
private T value;
108108

109-
private Class<T> classt;
109+
private Class<T> clazz;
110110

111-
public CustomAttribute(String name, T value, Class<T> classt) {
111+
public CustomAttribute(String name, T value, Class<T> clazz) {
112112
//noinspection SuspiciousMethodCalls
113-
if (!CLASSES.contains(classt)) {
114-
throw new InvalidException(String.format("cannot accept class type [%s] for custom attribute", classt.getName()));
113+
if (!CLASSES.contains(clazz)) {
114+
throw new InvalidException(String.format("cannot accept class type [%s] for custom attribute", clazz.getName()));
115115
}
116116
this.name = name;
117117
this.value = value;
118-
this.classt = classt;
118+
this.clazz = clazz;
119119

120120
}
121121

122122
public Class<T> getValueClass() {
123-
return classt;
123+
return clazz;
124124
}
125125

126126
public String getName() {
@@ -172,7 +172,7 @@ public int integerValue() {
172172
public int hashCode() {
173173
int result = name != null ? name.hashCode() : 0;
174174
result = 31 * result + (value != null ? value.hashCode() : 0);
175-
result = 31 * result + (classt != null ? classt.hashCode() : 0);
175+
result = 31 * result + (clazz != null ? clazz.hashCode() : 0);
176176
return result;
177177
}
178178

@@ -183,7 +183,7 @@ public boolean equals(Object o) {
183183

184184
CustomAttribute that = (CustomAttribute) o;
185185

186-
if (classt != null ? !classt.equals(that.classt) : that.classt != null) return false;
186+
if (clazz != null ? !clazz.equals(that.clazz) : that.clazz != null) return false;
187187
if (name != null ? !name.equals(that.name) : that.name != null) return false;
188188
//noinspection RedundantIfStatement
189189
if (value != null ? !value.equals(that.value) : that.value != null) return false;
@@ -196,7 +196,7 @@ public String toString() {
196196
return "CustomAttribute{" +
197197
"name='" + name + '\'' +
198198
", value=" + value +
199-
", classt=" + classt +
199+
", clazz=" + clazz +
200200
'}';
201201
}
202202
}

‎intercom-java/src/main/java/io/intercom/api/CustomAttributeSerializer.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package io.intercom.api;
22

3-
import com.fasterxml.jackson.core.JsonGenerationException;
43
import com.fasterxml.jackson.core.JsonGenerator;
54
import com.fasterxml.jackson.databind.SerializerProvider;
65
import com.fasterxml.jackson.databind.ser.std.StdSerializer;
7-
import io.intercom.api.CustomAttribute;
86

97
import java.io.IOException;
108

@@ -16,7 +14,7 @@ public CustomAttributeSerializer() {
1614

1715
@Override
1816
public void serialize(CustomAttribute value, JsonGenerator jgen, SerializerProvider provider)
19-
throws IOException, JsonGenerationException {
17+
throws IOException {
2018
// the field name has already been written
2119
jgen.writeObject(value.getValue());
2220
}

0 commit comments

Comments
 (0)