aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/org
diff options
context:
space:
mode:
authorAnton Tananaev <anton@traccar.org>2024-07-06 17:46:17 -0700
committerAnton Tananaev <anton@traccar.org>2024-07-06 17:46:17 -0700
commitb8390005722dd1cdb24d762797ef3f98ebc37755 (patch)
treecaabf1a7541aebc4e81565e95ee78e2d8afe3d75 /src/main/java/org
parent75e3c6a6bbb028b2f99b06faac66d5b53cf59900 (diff)
downloadtrackermap-server-b8390005722dd1cdb24d762797ef3f98ebc37755.tar.gz
trackermap-server-b8390005722dd1cdb24d762797ef3f98ebc37755.tar.bz2
trackermap-server-b8390005722dd1cdb24d762797ef3f98ebc37755.zip
Update instanceof expressions
Diffstat (limited to 'src/main/java/org')
-rw-r--r--src/main/java/org/traccar/BaseMqttProtocolDecoder.java12
-rw-r--r--src/main/java/org/traccar/BasePipelineFactory.java16
-rw-r--r--src/main/java/org/traccar/BaseProtocolDecoder.java4
-rw-r--r--src/main/java/org/traccar/BaseProtocolEncoder.java6
-rw-r--r--src/main/java/org/traccar/ExtendedObjectDecoder.java13
-rw-r--r--src/main/java/org/traccar/ProcessingHandler.java4
-rw-r--r--src/main/java/org/traccar/WrapperInboundHandler.java4
-rw-r--r--src/main/java/org/traccar/WrapperOutboundHandler.java3
-rw-r--r--src/main/java/org/traccar/api/BaseObjectResource.java9
-rw-r--r--src/main/java/org/traccar/api/ResourceErrorHandler.java3
-rw-r--r--src/main/java/org/traccar/api/security/PermissionsService.java9
-rw-r--r--src/main/java/org/traccar/handler/network/AcknowledgementHandler.java6
-rw-r--r--src/main/java/org/traccar/handler/network/NetworkMessageHandler.java6
-rw-r--r--src/main/java/org/traccar/handler/network/RemoteAddressHandler.java3
-rw-r--r--src/main/java/org/traccar/handler/network/StandardLoggingHandler.java6
-rw-r--r--src/main/java/org/traccar/helper/model/AttributeUtil.java16
-rw-r--r--src/main/java/org/traccar/model/ExtendedModel.java16
-rw-r--r--src/main/java/org/traccar/notification/PropertiesProvider.java4
-rw-r--r--src/main/java/org/traccar/protocol/FlespiProtocolDecoder.java14
-rw-r--r--src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java4
-rw-r--r--src/main/java/org/traccar/protocol/OutsafeProtocolDecoder.java8
-rw-r--r--src/main/java/org/traccar/protocol/T55ProtocolDecoder.java5
-rw-r--r--src/main/java/org/traccar/session/cache/CacheManager.java8
-rw-r--r--src/main/java/org/traccar/storage/DatabaseStorage.java30
-rw-r--r--src/main/java/org/traccar/storage/MemoryStorage.java34
-rw-r--r--src/main/java/org/traccar/storage/QueryBuilder.java24
26 files changed, 109 insertions, 158 deletions
diff --git a/src/main/java/org/traccar/BaseMqttProtocolDecoder.java b/src/main/java/org/traccar/BaseMqttProtocolDecoder.java
index 0388563f5..5a55eee74 100644
--- a/src/main/java/org/traccar/BaseMqttProtocolDecoder.java
+++ b/src/main/java/org/traccar/BaseMqttProtocolDecoder.java
@@ -38,9 +38,7 @@ public abstract class BaseMqttProtocolDecoder extends BaseProtocolDecoder {
protected final Object decode(
Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
- if (msg instanceof MqttConnectMessage) {
-
- MqttConnectMessage message = (MqttConnectMessage) msg;
+ if (msg instanceof MqttConnectMessage message) {
DeviceSession deviceSession = getDeviceSession(
channel, remoteAddress, message.payload().clientIdentifier());
@@ -55,9 +53,7 @@ public abstract class BaseMqttProtocolDecoder extends BaseProtocolDecoder {
channel.writeAndFlush(new NetworkMessage(response, remoteAddress));
}
- } else if (msg instanceof MqttSubscribeMessage) {
-
- MqttSubscribeMessage message = (MqttSubscribeMessage) msg;
+ } else if (msg instanceof MqttSubscribeMessage message) {
MqttMessage response = MqttMessageBuilders.subAck()
.packetId(message.variableHeader().messageId())
@@ -67,15 +63,13 @@ public abstract class BaseMqttProtocolDecoder extends BaseProtocolDecoder {
channel.writeAndFlush(new NetworkMessage(response, remoteAddress));
}
- } else if (msg instanceof MqttPublishMessage) {
+ } else if (msg instanceof MqttPublishMessage message) {
DeviceSession deviceSession = getDeviceSession(channel, remoteAddress);
if (deviceSession == null) {
return null;
}
- MqttPublishMessage message = (MqttPublishMessage) msg;
-
Object result = decode(deviceSession, message);
MqttMessage response = MqttMessageBuilders.pubAck()
diff --git a/src/main/java/org/traccar/BasePipelineFactory.java b/src/main/java/org/traccar/BasePipelineFactory.java
index 40360cca7..92b9759c1 100644
--- a/src/main/java/org/traccar/BasePipelineFactory.java
+++ b/src/main/java/org/traccar/BasePipelineFactory.java
@@ -64,10 +64,10 @@ public abstract class BasePipelineFactory extends ChannelInitializer<Channel> {
public static <T extends ChannelHandler> T getHandler(ChannelPipeline pipeline, Class<T> clazz) {
for (Map.Entry<String, ChannelHandler> handlerEntry : pipeline) {
ChannelHandler handler = handlerEntry.getValue();
- if (handler instanceof WrapperInboundHandler) {
- handler = ((WrapperInboundHandler) handler).getWrappedHandler();
- } else if (handler instanceof WrapperOutboundHandler) {
- handler = ((WrapperOutboundHandler) handler).getWrappedHandler();
+ if (handler instanceof WrapperInboundHandler wrapperHandler) {
+ handler = wrapperHandler.getWrappedHandler();
+ } else if (handler instanceof WrapperOutboundHandler wrapperHandler) {
+ handler = wrapperHandler.getWrappedHandler();
}
if (clazz.isAssignableFrom(handler.getClass())) {
return (T) handler;
@@ -106,10 +106,10 @@ public abstract class BasePipelineFactory extends ChannelInitializer<Channel> {
if (handler instanceof BaseProtocolDecoder || handler instanceof BaseProtocolEncoder) {
injectMembers(handler);
} else {
- if (handler instanceof ChannelInboundHandler) {
- handler = new WrapperInboundHandler((ChannelInboundHandler) handler);
- } else {
- handler = new WrapperOutboundHandler((ChannelOutboundHandler) handler);
+ if (handler instanceof ChannelInboundHandler channelHandler) {
+ handler = new WrapperInboundHandler(channelHandler);
+ } else if (handler instanceof ChannelOutboundHandler channelHandler) {
+ handler = new WrapperOutboundHandler(channelHandler);
}
}
pipeline.addLast(handler);
diff --git a/src/main/java/org/traccar/BaseProtocolDecoder.java b/src/main/java/org/traccar/BaseProtocolDecoder.java
index b764e5cdf..2f9c75ec2 100644
--- a/src/main/java/org/traccar/BaseProtocolDecoder.java
+++ b/src/main/java/org/traccar/BaseProtocolDecoder.java
@@ -168,8 +168,8 @@ public abstract class BaseProtocolDecoder extends ExtendedObjectDecoder {
}
Set<Long> deviceIds = new HashSet<>();
if (decodedMessage != null) {
- if (decodedMessage instanceof Position) {
- deviceIds.add(((Position) decodedMessage).getDeviceId());
+ if (decodedMessage instanceof Position position) {
+ deviceIds.add(position.getDeviceId());
} else if (decodedMessage instanceof Collection) {
Collection<Position> positions = (Collection) decodedMessage;
for (Position position : positions) {
diff --git a/src/main/java/org/traccar/BaseProtocolEncoder.java b/src/main/java/org/traccar/BaseProtocolEncoder.java
index e357c27dc..2724a59b1 100644
--- a/src/main/java/org/traccar/BaseProtocolEncoder.java
+++ b/src/main/java/org/traccar/BaseProtocolEncoder.java
@@ -82,11 +82,9 @@ public abstract class BaseProtocolEncoder extends ChannelOutboundHandlerAdapter
@Override
public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
- if (msg instanceof NetworkMessage) {
- NetworkMessage networkMessage = (NetworkMessage) msg;
- if (networkMessage.getMessage() instanceof Command) {
+ if (msg instanceof NetworkMessage networkMessage) {
+ if (networkMessage.getMessage() instanceof Command command) {
- Command command = (Command) networkMessage.getMessage();
Object encodedCommand = encodeCommand(ctx.channel(), command);
StringBuilder s = new StringBuilder();
diff --git a/src/main/java/org/traccar/ExtendedObjectDecoder.java b/src/main/java/org/traccar/ExtendedObjectDecoder.java
index 9468e2fff..8d693c7cf 100644
--- a/src/main/java/org/traccar/ExtendedObjectDecoder.java
+++ b/src/main/java/org/traccar/ExtendedObjectDecoder.java
@@ -54,14 +54,12 @@ public abstract class ExtendedObjectDecoder extends ChannelInboundHandlerAdapter
}
private void saveOriginal(Object decodedMessage, Object originalMessage) {
- if (getConfig().getBoolean(Keys.DATABASE_SAVE_ORIGINAL) && decodedMessage instanceof Position) {
- Position position = (Position) decodedMessage;
- if (originalMessage instanceof ByteBuf) {
- ByteBuf buf = (ByteBuf) originalMessage;
+ if (getConfig().getBoolean(Keys.DATABASE_SAVE_ORIGINAL) && decodedMessage instanceof Position position) {
+ if (originalMessage instanceof ByteBuf buf) {
position.set(Position.KEY_ORIGINAL, ByteBufUtil.hexDump(buf, 0, buf.writerIndex()));
- } else if (originalMessage instanceof String) {
+ } else if (originalMessage instanceof String stringMessage) {
position.set(Position.KEY_ORIGINAL, DataConverter.printHex(
- ((String) originalMessage).getBytes(StandardCharsets.US_ASCII)));
+ stringMessage.getBytes(StandardCharsets.US_ASCII)));
}
}
}
@@ -78,8 +76,7 @@ public abstract class ExtendedObjectDecoder extends ChannelInboundHandlerAdapter
decodedMessage = handleEmptyMessage(ctx.channel(), networkMessage.getRemoteAddress(), originalMessage);
}
if (decodedMessage != null) {
- if (decodedMessage instanceof Collection) {
- var collection = (Collection) decodedMessage;
+ if (decodedMessage instanceof Collection collection) {
ctx.writeAndFlush(new AcknowledgementHandler.EventDecoded(collection));
for (Object o : collection) {
saveOriginal(o, originalMessage);
diff --git a/src/main/java/org/traccar/ProcessingHandler.java b/src/main/java/org/traccar/ProcessingHandler.java
index bb040bfff..76442d402 100644
--- a/src/main/java/org/traccar/ProcessingHandler.java
+++ b/src/main/java/org/traccar/ProcessingHandler.java
@@ -131,8 +131,8 @@ public class ProcessingHandler extends ChannelInboundHandlerAdapter implements B
@Override
public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
- if (msg instanceof Position) {
- bufferingManager.accept(ctx, (Position) msg);
+ if (msg instanceof Position position) {
+ bufferingManager.accept(ctx, position);
} else {
super.channelRead(ctx, msg);
}
diff --git a/src/main/java/org/traccar/WrapperInboundHandler.java b/src/main/java/org/traccar/WrapperInboundHandler.java
index 5e2b1d304..7acca9c50 100644
--- a/src/main/java/org/traccar/WrapperInboundHandler.java
+++ b/src/main/java/org/traccar/WrapperInboundHandler.java
@@ -52,8 +52,7 @@ public class WrapperInboundHandler implements ChannelInboundHandler {
@Override
public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
- if (msg instanceof NetworkMessage) {
- NetworkMessage nm = (NetworkMessage) msg;
+ if (msg instanceof NetworkMessage nm) {
handler.channelRead(new WrapperContext(ctx, nm.getRemoteAddress()), nm.getMessage());
} else {
handler.channelRead(ctx, msg);
@@ -85,7 +84,6 @@ public class WrapperInboundHandler implements ChannelInboundHandler {
handler.handlerRemoved(ctx);
}
- @SuppressWarnings("deprecation")
@Override
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
handler.exceptionCaught(ctx, cause);
diff --git a/src/main/java/org/traccar/WrapperOutboundHandler.java b/src/main/java/org/traccar/WrapperOutboundHandler.java
index ae2b06ad2..8b9c01405 100644
--- a/src/main/java/org/traccar/WrapperOutboundHandler.java
+++ b/src/main/java/org/traccar/WrapperOutboundHandler.java
@@ -67,8 +67,7 @@ public class WrapperOutboundHandler implements ChannelOutboundHandler {
@Override
public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
- if (msg instanceof NetworkMessage) {
- NetworkMessage nm = (NetworkMessage) msg;
+ if (msg instanceof NetworkMessage nm) {
handler.write(new WrapperContext(ctx, nm.getRemoteAddress()), nm.getMessage(), promise);
} else {
handler.write(ctx, msg, promise);
diff --git a/src/main/java/org/traccar/api/BaseObjectResource.java b/src/main/java/org/traccar/api/BaseObjectResource.java
index 3c97dd1f8..e35850e1f 100644
--- a/src/main/java/org/traccar/api/BaseObjectResource.java
+++ b/src/main/java/org/traccar/api/BaseObjectResource.java
@@ -89,15 +89,13 @@ public abstract class BaseObjectResource<T extends BaseModel> extends BaseResour
permissionsService.checkPermission(baseClass, getUserId(), entity.getId());
boolean skipReadonly = false;
- if (entity instanceof User) {
- User after = (User) entity;
+ if (entity instanceof User after) {
User before = storage.getObject(User.class, new Request(
new Columns.All(), new Condition.Equals("id", entity.getId())));
permissionsService.checkUserUpdate(getUserId(), before, (User) entity);
skipReadonly = permissionsService.getUser(getUserId())
.compare(after, "notificationTokens", "termsAccepted");
- } else if (entity instanceof Group) {
- Group group = (Group) entity;
+ } else if (entity instanceof Group group) {
if (group.getId() == group.getGroupId()) {
throw new IllegalArgumentException("Cycle in group hierarchy");
}
@@ -108,8 +106,7 @@ public abstract class BaseObjectResource<T extends BaseModel> extends BaseResour
storage.updateObject(entity, new Request(
new Columns.Exclude("id"),
new Condition.Equals("id", entity.getId())));
- if (entity instanceof User) {
- User user = (User) entity;
+ if (entity instanceof User user) {
if (user.getHashedPassword() != null) {
storage.updateObject(entity, new Request(
new Columns.Include("hashedPassword", "salt"),
diff --git a/src/main/java/org/traccar/api/ResourceErrorHandler.java b/src/main/java/org/traccar/api/ResourceErrorHandler.java
index 387f3db6a..5f5e70632 100644
--- a/src/main/java/org/traccar/api/ResourceErrorHandler.java
+++ b/src/main/java/org/traccar/api/ResourceErrorHandler.java
@@ -25,8 +25,7 @@ public class ResourceErrorHandler implements ExceptionMapper<Exception> {
@Override
public Response toResponse(Exception e) {
- if (e instanceof WebApplicationException) {
- WebApplicationException webException = (WebApplicationException) e;
+ if (e instanceof WebApplicationException webException) {
return Response.fromResponse(webException.getResponse()).entity(Log.exceptionStack(webException)).build();
} else {
return Response.status(Response.Status.BAD_REQUEST).entity(Log.exceptionStack(e)).build();
diff --git a/src/main/java/org/traccar/api/security/PermissionsService.java b/src/main/java/org/traccar/api/security/PermissionsService.java
index d4a6fba1a..721793c2f 100644
--- a/src/main/java/org/traccar/api/security/PermissionsService.java
+++ b/src/main/java/org/traccar/api/security/PermissionsService.java
@@ -128,8 +128,7 @@ public class PermissionsService {
throws StorageException, SecurityException {
if (!getUser(userId).getAdministrator()) {
checkEdit(userId, object.getClass(), addition, skipReadonly);
- if (object instanceof GroupedModel) {
- GroupedModel after = ((GroupedModel) object);
+ if (object instanceof GroupedModel after) {
if (after.getGroupId() > 0) {
GroupedModel before = null;
if (!addition) {
@@ -141,8 +140,7 @@ public class PermissionsService {
}
}
}
- if (object instanceof Schedulable) {
- Schedulable after = ((Schedulable) object);
+ if (object instanceof Schedulable after) {
if (after.getCalendarId() > 0) {
Schedulable before = null;
if (!addition) {
@@ -154,8 +152,7 @@ public class PermissionsService {
}
}
}
- if (object instanceof Notification) {
- Notification after = ((Notification) object);
+ if (object instanceof Notification after) {
if (after.getCommandId() > 0) {
Notification before = null;
if (!addition) {
diff --git a/src/main/java/org/traccar/handler/network/AcknowledgementHandler.java b/src/main/java/org/traccar/handler/network/AcknowledgementHandler.java
index e87f5d34c..7ba625e00 100644
--- a/src/main/java/org/traccar/handler/network/AcknowledgementHandler.java
+++ b/src/main/java/org/traccar/handler/network/AcknowledgementHandler.java
@@ -92,12 +92,10 @@ public class AcknowledgementHandler extends ChannelOutboundHandlerAdapter {
if (queue == null) {
queue = new LinkedList<>();
}
- } else if (msg instanceof EventDecoded) {
- EventDecoded event = (EventDecoded) msg;
+ } else if (msg instanceof EventDecoded event) {
LOGGER.debug("Event decoded {}", event.getObjects().size());
waiting.addAll(event.getObjects());
- } else if (msg instanceof EventHandled) {
- EventHandled event = (EventHandled) msg;
+ } else if (msg instanceof EventHandled event) {
LOGGER.debug("Event handled");
waiting.remove(event.getObject());
}
diff --git a/src/main/java/org/traccar/handler/network/NetworkMessageHandler.java b/src/main/java/org/traccar/handler/network/NetworkMessageHandler.java
index c2fb9016a..f151c91a9 100644
--- a/src/main/java/org/traccar/handler/network/NetworkMessageHandler.java
+++ b/src/main/java/org/traccar/handler/network/NetworkMessageHandler.java
@@ -32,16 +32,14 @@ public class NetworkMessageHandler extends ChannelDuplexHandler {
if (ctx.channel() instanceof DatagramChannel) {
DatagramPacket packet = (DatagramPacket) msg;
ctx.fireChannelRead(new NetworkMessage(packet.content(), packet.sender()));
- } else if (msg instanceof ByteBuf) {
- ByteBuf buffer = (ByteBuf) msg;
+ } else if (msg instanceof ByteBuf buffer) {
ctx.fireChannelRead(new NetworkMessage(buffer, ctx.channel().remoteAddress()));
}
}
@Override
public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) {
- if (msg instanceof NetworkMessage) {
- NetworkMessage message = (NetworkMessage) msg;
+ if (msg instanceof NetworkMessage message) {
if (ctx.channel() instanceof DatagramChannel) {
InetSocketAddress recipient = (InetSocketAddress) message.getRemoteAddress();
InetSocketAddress sender = (InetSocketAddress) ctx.channel().localAddress();
diff --git a/src/main/java/org/traccar/handler/network/RemoteAddressHandler.java b/src/main/java/org/traccar/handler/network/RemoteAddressHandler.java
index c52bb2be1..9d5504ce1 100644
--- a/src/main/java/org/traccar/handler/network/RemoteAddressHandler.java
+++ b/src/main/java/org/traccar/handler/network/RemoteAddressHandler.java
@@ -44,8 +44,7 @@ public class RemoteAddressHandler extends ChannelInboundHandlerAdapter {
InetSocketAddress remoteAddress = (InetSocketAddress) ctx.channel().remoteAddress();
String hostAddress = remoteAddress != null ? remoteAddress.getAddress().getHostAddress() : null;
- if (msg instanceof Position) {
- Position position = (Position) msg;
+ if (msg instanceof Position position) {
position.set(Position.KEY_IP, hostAddress);
}
}
diff --git a/src/main/java/org/traccar/handler/network/StandardLoggingHandler.java b/src/main/java/org/traccar/handler/network/StandardLoggingHandler.java
index f6ee08756..8e63cae4d 100644
--- a/src/main/java/org/traccar/handler/network/StandardLoggingHandler.java
+++ b/src/main/java/org/traccar/handler/network/StandardLoggingHandler.java
@@ -72,12 +72,10 @@ public class StandardLoggingHandler extends ChannelDuplexHandler {
}
private LogRecord createLogRecord(ChannelHandlerContext ctx, Object msg) {
- if (msg instanceof NetworkMessage) {
- NetworkMessage networkMessage = (NetworkMessage) msg;
- if (networkMessage.getMessage() instanceof ByteBuf) {
+ if (msg instanceof NetworkMessage networkMessage) {
+ if (networkMessage.getMessage() instanceof ByteBuf data) {
LogRecord record = new LogRecord(ctx.channel().localAddress(), networkMessage.getRemoteAddress());
record.setProtocol(protocol);
- ByteBuf data = (ByteBuf) networkMessage.getMessage();
if (decodeTextData && BufferUtil.isPrintable(data, data.readableBytes())) {
record.setData(data.getCharSequence(
data.readerIndex(), data.readableBytes(), StandardCharsets.US_ASCII).toString()
diff --git a/src/main/java/org/traccar/helper/model/AttributeUtil.java b/src/main/java/org/traccar/helper/model/AttributeUtil.java
index 2630f64f0..0e3d91766 100644
--- a/src/main/java/org/traccar/helper/model/AttributeUtil.java
+++ b/src/main/java/org/traccar/helper/model/AttributeUtil.java
@@ -70,20 +70,20 @@ public final class AttributeUtil {
if (result != null) {
Class<T> valueClass = key.getValueClass();
if (valueClass.equals(Boolean.class)) {
- return (T) (result instanceof String
- ? Boolean.parseBoolean((String) result)
+ return (T) (result instanceof String stringResult
+ ? Boolean.parseBoolean(stringResult)
: result);
} else if (valueClass.equals(Integer.class)) {
- return (T) (Object) (result instanceof String
- ? Integer.parseInt((String) result)
+ return (T) (Object) (result instanceof String stringResult
+ ? Integer.parseInt(stringResult)
: ((Number) result).intValue());
} else if (valueClass.equals(Long.class)) {
- return (T) (Object) (result instanceof String
- ? Long.parseLong((String) result)
+ return (T) (Object) (result instanceof String stringResult
+ ? Long.parseLong(stringResult)
: ((Number) result).longValue());
} else if (valueClass.equals(Double.class)) {
- return (T) (Object) (result instanceof String
- ? Double.parseDouble((String) result)
+ return (T) (Object) (result instanceof String stringResult
+ ? Double.parseDouble(stringResult)
: ((Number) result).doubleValue());
} else {
return (T) result;
diff --git a/src/main/java/org/traccar/model/ExtendedModel.java b/src/main/java/org/traccar/model/ExtendedModel.java
index d5cd094da..f1183e11a 100644
--- a/src/main/java/org/traccar/model/ExtendedModel.java
+++ b/src/main/java/org/traccar/model/ExtendedModel.java
@@ -105,8 +105,8 @@ public class ExtendedModel extends BaseModel {
public double getDouble(String key) {
if (attributes.containsKey(key)) {
Object value = attributes.get(key);
- if (value instanceof Number) {
- return ((Number) attributes.get(key)).doubleValue();
+ if (value instanceof Number numberValue) {
+ return numberValue.doubleValue();
} else {
return Double.parseDouble(value.toString());
}
@@ -118,8 +118,8 @@ public class ExtendedModel extends BaseModel {
public boolean getBoolean(String key) {
if (attributes.containsKey(key)) {
Object value = attributes.get(key);
- if (value instanceof Boolean) {
- return (Boolean) attributes.get(key);
+ if (value instanceof Boolean booleanValue) {
+ return booleanValue;
} else {
return Boolean.parseBoolean(value.toString());
}
@@ -131,8 +131,8 @@ public class ExtendedModel extends BaseModel {
public int getInteger(String key) {
if (attributes.containsKey(key)) {
Object value = attributes.get(key);
- if (value instanceof Number) {
- return ((Number) attributes.get(key)).intValue();
+ if (value instanceof Number numberValue) {
+ return numberValue.intValue();
} else {
return Integer.parseInt(value.toString());
}
@@ -144,8 +144,8 @@ public class ExtendedModel extends BaseModel {
public long getLong(String key) {
if (attributes.containsKey(key)) {
Object value = attributes.get(key);
- if (value instanceof Number) {
- return ((Number) attributes.get(key)).longValue();
+ if (value instanceof Number numberValue) {
+ return numberValue.longValue();
} else {
return Long.parseLong(value.toString());
}
diff --git a/src/main/java/org/traccar/notification/PropertiesProvider.java b/src/main/java/org/traccar/notification/PropertiesProvider.java
index 91887b5d4..5178b9a9e 100644
--- a/src/main/java/org/traccar/notification/PropertiesProvider.java
+++ b/src/main/java/org/traccar/notification/PropertiesProvider.java
@@ -48,7 +48,7 @@ public class PropertiesProvider {
} else {
Object result = extendedModel.getAttributes().get(key.getKey());
if (result != null) {
- return result instanceof String ? Integer.parseInt((String) result) : (Integer) result;
+ return result instanceof String stringResult ? Integer.parseInt(stringResult) : (Integer) result;
} else {
return key.getDefaultValue();
}
@@ -65,7 +65,7 @@ public class PropertiesProvider {
} else {
Object result = extendedModel.getAttributes().get(key.getKey());
if (result != null) {
- return result instanceof String ? Boolean.valueOf((String) result) : (Boolean) result;
+ return result instanceof String stringResult ? Boolean.valueOf(stringResult) : (Boolean) result;
} else {
return null;
}
diff --git a/src/main/java/org/traccar/protocol/FlespiProtocolDecoder.java b/src/main/java/org/traccar/protocol/FlespiProtocolDecoder.java
index ea076afd8..168b3b3cd 100644
--- a/src/main/java/org/traccar/protocol/FlespiProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/FlespiProtocolDecoder.java
@@ -247,15 +247,15 @@ public class FlespiProtocolDecoder extends BaseHttpProtocolDecoder {
}
private void decodeUnknownParam(String name, JsonValue value, Position position) {
- if (value instanceof JsonNumber) {
- if (((JsonNumber) value).isIntegral()) {
- position.set(name, ((JsonNumber) value).longValue());
+ if (value instanceof JsonNumber jsonNumber) {
+ if (jsonNumber.isIntegral()) {
+ position.set(name, jsonNumber.longValue());
} else {
- position.set(name, ((JsonNumber) value).doubleValue());
+ position.set(name, jsonNumber.doubleValue());
}
- position.set(name, ((JsonNumber) value).doubleValue());
- } else if (value instanceof JsonString) {
- position.set(name, ((JsonString) value).getString());
+ position.set(name, jsonNumber.doubleValue());
+ } else if (value instanceof JsonString jsonString) {
+ position.set(name, jsonString.getString());
} else if (value == JsonValue.TRUE || value == JsonValue.FALSE) {
position.set(name, value == JsonValue.TRUE);
}
diff --git a/src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java
index 3afea3b1b..373e1c91c 100644
--- a/src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java
@@ -1729,8 +1729,8 @@ public class Gl200TextProtocolDecoder extends BaseProtocolDecoder {
}
if (result != null) {
- if (result instanceof Position) {
- ((Position) result).set(Position.KEY_TYPE, type);
+ if (result instanceof Position position) {
+ position.set(Position.KEY_TYPE, type);
} else {
for (Position p : (List<Position>) result) {
p.set(Position.KEY_TYPE, type);
diff --git a/src/main/java/org/traccar/protocol/OutsafeProtocolDecoder.java b/src/main/java/org/traccar/protocol/OutsafeProtocolDecoder.java
index f71778412..0a6026d91 100644
--- a/src/main/java/org/traccar/protocol/OutsafeProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/OutsafeProtocolDecoder.java
@@ -77,10 +77,10 @@ public class OutsafeProtocolDecoder extends BaseHttpProtocolDecoder {
}
private void decodeUnknownParam(String name, JsonValue value, Position position) {
- if (value instanceof JsonNumber) {
- position.set(name, ((JsonNumber) value).doubleValue());
- } else if (value instanceof JsonString) {
- position.set(name, ((JsonString) value).getString());
+ if (value instanceof JsonNumber jsonNumber) {
+ position.set(name, jsonNumber.doubleValue());
+ } else if (value instanceof JsonString jsonString) {
+ position.set(name, jsonString.getString());
} else if (value == JsonValue.TRUE || value == JsonValue.FALSE) {
position.set(name, value == JsonValue.TRUE);
}
diff --git a/src/main/java/org/traccar/protocol/T55ProtocolDecoder.java b/src/main/java/org/traccar/protocol/T55ProtocolDecoder.java
index 9e7518ce5..2538c914d 100644
--- a/src/main/java/org/traccar/protocol/T55ProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/T55ProtocolDecoder.java
@@ -420,9 +420,8 @@ public class T55ProtocolDecoder extends BaseProtocolDecoder {
sentence = sentence.substring(index);
} else {
deviceSession = getDeviceSession(channel, remoteAddress);
- if (deviceSession == null && remoteAddress instanceof InetSocketAddress) {
- String host = ((InetSocketAddress) remoteAddress).getHostString();
- deviceSession = getDeviceSession(channel, remoteAddress, host);
+ if (deviceSession == null && remoteAddress instanceof InetSocketAddress inetSocketAddress) {
+ deviceSession = getDeviceSession(channel, remoteAddress, inetSocketAddress.getHostString());
}
}
diff --git a/src/main/java/org/traccar/session/cache/CacheManager.java b/src/main/java/org/traccar/session/cache/CacheManager.java
index f7458567c..39546a5a7 100644
--- a/src/main/java/org/traccar/session/cache/CacheManager.java
+++ b/src/main/java/org/traccar/session/cache/CacheManager.java
@@ -296,8 +296,8 @@ public class CacheManager implements BroadcastInterface {
}
}
} else {
- if (object instanceof GroupedModel) {
- long groupId = ((GroupedModel) object).getGroupId();
+ if (object instanceof GroupedModel groupedModel) {
+ long groupId = groupedModel.getGroupId();
if (groupId > 0) {
invalidatePermission(object.getClass(), object.getId(), Group.class, groupId, true);
}
@@ -319,8 +319,8 @@ public class CacheManager implements BroadcastInterface {
}
}
- if (object instanceof Schedulable) {
- long calendarId = ((Schedulable) object).getCalendarId();
+ if (object instanceof Schedulable schedulable) {
+ long calendarId = schedulable.getCalendarId();
if (calendarId > 0) {
invalidatePermission(object.getClass(), object.getId(), Calendar.class, calendarId, true);
}
diff --git a/src/main/java/org/traccar/storage/DatabaseStorage.java b/src/main/java/org/traccar/storage/DatabaseStorage.java
index d20429319..1ff043e77 100644
--- a/src/main/java/org/traccar/storage/DatabaseStorage.java
+++ b/src/main/java/org/traccar/storage/DatabaseStorage.java
@@ -206,28 +206,23 @@ public class DatabaseStorage extends Storage {
private Map<String, Object> getConditionVariables(Condition genericCondition) {
Map<String, Object> results = new HashMap<>();
- if (genericCondition instanceof Condition.Compare) {
- var condition = (Condition.Compare) genericCondition;
+ if (genericCondition instanceof Condition.Compare condition) {
if (condition.getValue() != null) {
results.put(condition.getVariable(), condition.getValue());
}
- } else if (genericCondition instanceof Condition.Between) {
- var condition = (Condition.Between) genericCondition;
+ } else if (genericCondition instanceof Condition.Between condition) {
results.put(condition.getFromVariable(), condition.getFromValue());
results.put(condition.getToVariable(), condition.getToValue());
- } else if (genericCondition instanceof Condition.Binary) {
- var condition = (Condition.Binary) genericCondition;
+ } else if (genericCondition instanceof Condition.Binary condition) {
results.putAll(getConditionVariables(condition.getFirst()));
results.putAll(getConditionVariables(condition.getSecond()));
- } else if (genericCondition instanceof Condition.Permission) {
- var condition = (Condition.Permission) genericCondition;
+ } else if (genericCondition instanceof Condition.Permission condition) {
if (condition.getOwnerId() > 0) {
results.put(Permission.getKey(condition.getOwnerClass()), condition.getOwnerId());
} else {
results.put(Permission.getKey(condition.getPropertyClass()), condition.getPropertyId());
}
- } else if (genericCondition instanceof Condition.LatestPositions) {
- var condition = (Condition.LatestPositions) genericCondition;
+ } else if (genericCondition instanceof Condition.LatestPositions condition) {
if (condition.getDeviceId() > 0) {
results.put("deviceId", condition.getDeviceId());
}
@@ -249,43 +244,38 @@ public class DatabaseStorage extends Storage {
if (appendWhere) {
result.append(" WHERE ");
}
- if (genericCondition instanceof Condition.Compare) {
+ if (genericCondition instanceof Condition.Compare condition) {
- var condition = (Condition.Compare) genericCondition;
result.append(condition.getColumn());
result.append(" ");
result.append(condition.getOperator());
result.append(" :");
result.append(condition.getVariable());
- } else if (genericCondition instanceof Condition.Between) {
+ } else if (genericCondition instanceof Condition.Between condition) {
- var condition = (Condition.Between) genericCondition;
result.append(condition.getColumn());
result.append(" BETWEEN :");
result.append(condition.getFromVariable());
result.append(" AND :");
result.append(condition.getToVariable());
- } else if (genericCondition instanceof Condition.Binary) {
+ } else if (genericCondition instanceof Condition.Binary condition) {
- var condition = (Condition.Binary) genericCondition;
result.append(formatCondition(condition.getFirst(), false));
result.append(" ");
result.append(condition.getOperator());
result.append(" ");
result.append(formatCondition(condition.getSecond(), false));
- } else if (genericCondition instanceof Condition.Permission) {
+ } else if (genericCondition instanceof Condition.Permission condition) {
- var condition = (Condition.Permission) genericCondition;
result.append("id IN (");
result.append(formatPermissionQuery(condition));
result.append(")");
- } else if (genericCondition instanceof Condition.LatestPositions) {
+ } else if (genericCondition instanceof Condition.LatestPositions condition) {
- var condition = (Condition.LatestPositions) genericCondition;
result.append("id IN (");
result.append("SELECT positionId FROM ");
result.append(getStorageName(Device.class));
diff --git a/src/main/java/org/traccar/storage/MemoryStorage.java b/src/main/java/org/traccar/storage/MemoryStorage.java
index 9b5db1209..18cb6a294 100644
--- a/src/main/java/org/traccar/storage/MemoryStorage.java
+++ b/src/main/java/org/traccar/storage/MemoryStorage.java
@@ -60,47 +60,37 @@ public class MemoryStorage extends Storage {
return true;
}
- if (genericCondition instanceof Condition.Compare) {
+ if (genericCondition instanceof Condition.Compare condition) {
- var condition = (Condition.Compare) genericCondition;
Object value = retrieveValue(object, condition.getVariable());
int result = ((Comparable) value).compareTo(condition.getValue());
- switch (condition.getOperator()) {
- case "<":
- return result < 0;
- case "<=":
- return result <= 0;
- case ">":
- return result > 0;
- case ">=":
- return result >= 0;
- case "=":
- return result == 0;
- default:
- throw new RuntimeException("Unsupported comparison condition");
- }
+ return switch (condition.getOperator()) {
+ case "<" -> result < 0;
+ case "<=" -> result <= 0;
+ case ">" -> result > 0;
+ case ">=" -> result >= 0;
+ case "=" -> result == 0;
+ default -> throw new RuntimeException("Unsupported comparison condition");
+ };
- } else if (genericCondition instanceof Condition.Between) {
+ } else if (genericCondition instanceof Condition.Between condition) {
- var condition = (Condition.Between) genericCondition;
Object fromValue = retrieveValue(object, condition.getFromVariable());
int fromResult = ((Comparable) fromValue).compareTo(condition.getFromValue());
Object toValue = retrieveValue(object, condition.getToVariable());
int toResult = ((Comparable) toValue).compareTo(condition.getToValue());
return fromResult >= 0 && toResult <= 0;
- } else if (genericCondition instanceof Condition.Binary) {
+ } else if (genericCondition instanceof Condition.Binary condition) {
- var condition = (Condition.Binary) genericCondition;
if (condition.getOperator().equals("AND")) {
return checkCondition(condition.getFirst(), object) && checkCondition(condition.getSecond(), object);
} else if (condition.getOperator().equals("OR")) {
return checkCondition(condition.getFirst(), object) || checkCondition(condition.getSecond(), object);
}
- } else if (genericCondition instanceof Condition.Permission) {
+ } else if (genericCondition instanceof Condition.Permission condition) {
- var condition = (Condition.Permission) genericCondition;
long id = (Long) retrieveValue(object, "id");
return getPermissionsSet(condition.getOwnerClass(), condition.getPropertyClass()).stream()
.anyMatch(pair -> {
diff --git a/src/main/java/org/traccar/storage/QueryBuilder.java b/src/main/java/org/traccar/storage/QueryBuilder.java
index 2f4c07406..6a9c46807 100644
--- a/src/main/java/org/traccar/storage/QueryBuilder.java
+++ b/src/main/java/org/traccar/storage/QueryBuilder.java
@@ -267,18 +267,18 @@ public final class QueryBuilder {
}
public QueryBuilder setValue(String name, Object value) throws SQLException {
- if (value instanceof Boolean) {
- setBoolean(name, (Boolean) value);
- } else if (value instanceof Integer) {
- setInteger(name, (Integer) value);
- } else if (value instanceof Long) {
- setLong(name, (Long) value);
- } else if (value instanceof Double) {
- setDouble(name, (Double) value);
- } else if (value instanceof String) {
- setString(name, (String) value);
- } else if (value instanceof Date) {
- setDate(name, (Date) value);
+ if (value instanceof Boolean booleanValue) {
+ setBoolean(name, booleanValue);
+ } else if (value instanceof Integer integerValue) {
+ setInteger(name, integerValue);
+ } else if (value instanceof Long longValue) {
+ setLong(name, longValue);
+ } else if (value instanceof Double doubleValue) {
+ setDouble(name, doubleValue);
+ } else if (value instanceof String stringValue) {
+ setString(name, stringValue);
+ } else if (value instanceof Date dateValue) {
+ setDate(name, dateValue);
}
return this;
}