Skip to content

Commit f342ced

Browse files
Apply Palantir Java Format
1 parent 6a43586 commit f342ced

26 files changed

Lines changed: 89 additions & 75 deletions

File tree

rqueue-core/src/main/java/com/github/sonus21/rqueue/converter/GenericMessageConverter.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ public class GenericMessageConverter implements SmartMessageConverter {
5757
private final SmartMessageSerDes smartMessageSerDes;
5858

5959
public GenericMessageConverter() {
60-
this.smartMessageSerDes = new SmartMessageSerDes(
61-
SerializationUtils.getSerDes(), SerializationUtils.getTypeFactory());
60+
this.smartMessageSerDes =
61+
new SmartMessageSerDes(SerializationUtils.getSerDes(), SerializationUtils.getTypeFactory());
6262
}
6363

6464
public GenericMessageConverter(RqueueSerDes serDes, RqueueTypeFactory typeFactory) {
@@ -131,6 +131,7 @@ private static class Msg {
131131
@JsonSerialize(using = Utf8BytesSerializer.class)
132132
@JsonDeserialize(using = Utf8BytesDeserializer.class)
133133
private byte[] msg;
134+
134135
private String name;
135136
}
136137

rqueue-core/src/main/java/com/github/sonus21/rqueue/core/RqueueInternalPubSubChannel.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,8 @@ private void processEvent(byte[] body) {
118118
handlePauseEvent(rqueuePubSubEvent.messageAs(serDes, PauseUnpauseQueueRequest.class));
119119
break;
120120
case QUEUE_CRUD:
121-
rqueueBeanProvider.getRqueueSystemConfigDao()
121+
rqueueBeanProvider
122+
.getRqueueSystemConfigDao()
122123
.clearCacheByName(rqueuePubSubEvent.messageAs(serDes, String.class));
123124
break;
124125
default:

rqueue-core/src/main/java/com/github/sonus21/rqueue/serdes/RqueueSerDes.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
*/
1010
package com.github.sonus21.rqueue.serdes;
1111

12-
import tools.jackson.databind.JavaType;
1312
import java.io.IOException;
1413

1514
/**

rqueue-core/src/main/java/com/github/sonus21/rqueue/serdes/SerializationUtils.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ public final class SerializationUtils {
3636
@Getter
3737
public static RqueueTypeFactory typeFactory = new RqJacksonTypeFactory(objectMapper);
3838

39-
private SerializationUtils() {
40-
}
39+
private SerializationUtils() {}
4140

4241
public static boolean isEmpty(byte[] bytes) {
4342
return bytes == null || bytes.length == 0;
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
package com.github.sonus21.rqueue.serdes;
22

3-
public interface TypeEnvelop {
4-
}
3+
public interface TypeEnvelop {}

rqueue-core/src/main/java/com/github/sonus21/rqueue/utils/HttpUtils.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,15 @@
1717
package com.github.sonus21.rqueue.utils;
1818

1919
import com.github.sonus21.rqueue.config.RqueueConfig;
20+
import com.github.sonus21.rqueue.serdes.SerializationUtils;
2021
import java.net.InetSocketAddress;
2122
import java.net.ProxySelector;
2223
import java.net.URI;
2324
import java.net.http.HttpClient;
2425
import java.net.http.HttpRequest;
2526
import java.net.http.HttpResponse;
2627
import java.time.Duration;
27-
import com.github.sonus21.rqueue.serdes.SerializationUtils;
2828
import lombok.extern.slf4j.Slf4j;
29-
import tools.jackson.databind.ObjectMapper;
3029

3130
@Slf4j
3231
public final class HttpUtils {

rqueue-core/src/main/java/com/github/sonus21/rqueue/worker/RqueueWorkerRegistryImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
import com.github.sonus21.rqueue.models.registry.RqueueWorkerInfo;
2424
import com.github.sonus21.rqueue.models.registry.RqueueWorkerPollerMetadata;
2525
import com.github.sonus21.rqueue.models.registry.RqueueWorkerPollerView;
26-
import com.github.sonus21.rqueue.utils.DateTimeUtils;
27-
import com.github.sonus21.rqueue.utils.QueueThreadPool;
2826
import com.github.sonus21.rqueue.serdes.RqueueSerDes;
2927
import com.github.sonus21.rqueue.serdes.SerializationUtils;
28+
import com.github.sonus21.rqueue.utils.DateTimeUtils;
29+
import com.github.sonus21.rqueue.utils.QueueThreadPool;
3030
import com.github.sonus21.rqueue.utils.StringUtils;
3131
import java.lang.management.ManagementFactory;
3232
import java.net.InetAddress;

rqueue-core/src/test/java/com/github/sonus21/rqueue/converter/GenericMessageConverterTest.java

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,12 @@
1717
package com.github.sonus21.rqueue.converter;
1818

1919
import static org.junit.jupiter.api.Assertions.assertEquals;
20-
import static org.junit.jupiter.api.Assertions.assertNotNull;
2120
import static org.junit.jupiter.api.Assertions.assertNull;
2221

2322
import com.github.sonus21.TestBase;
2423
import com.github.sonus21.rqueue.CoreUnitTest;
2524
import com.github.sonus21.rqueue.listener.RqueueMessageHeaders;
2625
import com.github.sonus21.rqueue.serdes.SerializationUtils;
27-
import tools.jackson.databind.ObjectMapper;
2826
import java.lang.reflect.GenericArrayType;
2927
import java.lang.reflect.ParameterizedType;
3028
import java.lang.reflect.Type;
@@ -50,6 +48,7 @@
5048
import tools.jackson.core.JsonParser;
5149
import tools.jackson.databind.DeserializationContext;
5250
import tools.jackson.databind.JsonNode;
51+
import tools.jackson.databind.ObjectMapper;
5352
import tools.jackson.databind.SerializationContext;
5453
import tools.jackson.databind.deser.std.StdDeserializer;
5554
import tools.jackson.databind.module.SimpleModule;
@@ -179,31 +178,31 @@ void backwardCompatibility() throws Exception {
179178
ObjectMapper mapper = SerializationUtils.getObjectMapper();
180179

181180
Comment unicodeComment = new Comment("u-1", "Héllo 你好 🎉");
182-
Comment asciiComment = new Comment("a-1", "plain ascii");
183-
Email specialEmail = new Email("e-2", "subject: re: hello & goodbye");
181+
Comment asciiComment = new Comment("a-1", "plain ascii");
182+
Email specialEmail = new Email("e-2", "subject: re: hello & goodbye");
184183

185184
// 5 cases: class name is straightforward for non-generic POJOs
186185
Object[][] cases = {
187-
{comment, comment.getClass().getName()},
188-
{email, email.getClass().getName()},
189-
{unicodeComment, unicodeComment.getClass().getName()},
190-
{asciiComment, asciiComment.getClass().getName()},
191-
{specialEmail, specialEmail.getClass().getName()},
186+
{comment, comment.getClass().getName()},
187+
{email, email.getClass().getName()},
188+
{unicodeComment, unicodeComment.getClass().getName()},
189+
{asciiComment, asciiComment.getClass().getName()},
190+
{specialEmail, specialEmail.getClass().getName()},
192191
};
193192

194193
for (Object[] c : cases) {
195-
Object payload = c[0];
194+
Object payload = c[0];
196195
String className = (String) c[1];
197196

198197
// Build old-format JSON: {"msg":"<json-string>","name":"<className>"}
199-
String innerJson = mapper.writeValueAsString(payload);
198+
String innerJson = mapper.writeValueAsString(payload);
200199
String oldFormatJson = mapper.writeValueAsString(new OldMsg(innerJson, className));
201200

202-
Object restored = genericMessageConverter.fromMessage(
203-
new GenericMessage<>(oldFormatJson), null);
201+
Object restored =
202+
genericMessageConverter.fromMessage(new GenericMessage<>(oldFormatJson), null);
204203

205-
assertEquals(payload, restored,
206-
"old String-format data must deserialise correctly for " + className);
204+
assertEquals(
205+
payload, restored, "old String-format data must deserialise correctly for " + className);
207206
}
208207
}
209208

rqueue-core/src/test/java/com/github/sonus21/rqueue/converter/JsonMessageConverterTest.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222

2323
import com.github.sonus21.TestBase;
2424
import com.github.sonus21.rqueue.CoreUnitTest;
25+
import com.github.sonus21.rqueue.serdes.RqJacksonSerDes;
26+
import com.github.sonus21.rqueue.serdes.RqueueSerDes;
2527
import java.util.UUID;
2628
import lombok.AllArgsConstructor;
2729
import lombok.Data;
@@ -31,16 +33,15 @@
3133
import org.junit.jupiter.api.Test;
3234
import org.springframework.messaging.Message;
3335
import org.springframework.messaging.converter.MessageConverter;
34-
import com.github.sonus21.rqueue.serdes.RqJacksonSerDes;
35-
import com.github.sonus21.rqueue.serdes.RqueueSerDes;
3636
import tools.jackson.databind.DeserializationFeature;
3737
import tools.jackson.databind.json.JsonMapper;
3838

3939
@CoreUnitTest
4040
class JsonMessageConverterTest extends TestBase {
4141

42-
private final RqueueSerDes serDes = new RqJacksonSerDes(
43-
JsonMapper.builder().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false).build());
42+
private final RqueueSerDes serDes = new RqJacksonSerDes(JsonMapper.builder()
43+
.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
44+
.build());
4445
private final MessageConverter messageConverter = new JsonMessageConverter();
4546
private final MessageConverter messageConverter2 = new JsonMessageConverter(serDes);
4647

rqueue-nats/src/main/java/com/github/sonus21/rqueue/nats/dao/NatsRqueueJobDao.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ public class NatsRqueueJobDao implements RqueueJobDao {
5151
private final NatsProvisioner provisioner;
5252
private final com.github.sonus21.rqueue.serdes.RqueueSerDes serdes;
5353

54-
public NatsRqueueJobDao(NatsProvisioner provisioner, com.github.sonus21.rqueue.serdes.RqueueSerDes serdes) {
54+
public NatsRqueueJobDao(
55+
NatsProvisioner provisioner, com.github.sonus21.rqueue.serdes.RqueueSerDes serdes) {
5556
this.provisioner = provisioner;
5657
this.serdes = serdes;
5758
}

0 commit comments

Comments
 (0)