100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Minor code cleanup
Rich Turnerc8e08878e31b
diff --git a/agent/src/main/java/org/openremote/agent/protocol/serial/SerialIoClient.java b/agent/src/main/java/org/openremote/agent/protocol/serial/SerialIoClient.javaindex e3266563d..f51e81ddf 100644--- a/agent/src/main/java/org/openremote/agent/protocol/serial/SerialIoClient.java+++ b/agent/src/main/java/org/openremote/agent/protocol/serial/SerialIoClient.java@@ -21,7 +21,6 @@ package org.openremote.agent.protocol.serial;import io.netty.channel.Channel;import io.netty.channel.ChannelFuture;-import io.netty.channel.oio.OioEventLoopGroup;import org.openremote.agent.protocol.ProtocolExecutorService;import org.openremote.agent.protocol.io.AbstractNettyIoClient;import org.openremote.agent.protocol.io.IoClient;@@ -69,6 +68,6 @@ public class SerialIoClient<T> extends AbstractNettyIoClient<T, NrJavaSerialAddrprotected io.netty.channel.EventLoopGroup getWorkerGroup() {// Note that OioEventLoopGroup has to be used because NioEventLoopGroup is *NOT* compatible// with io.netty.channel.rxtx.RxtxChannel and causes IllegalStateException.- return new OioEventLoopGroup(1);+ return new io.netty.channel.oio.OioEventLoopGroup(1);}}diff --git a/agent/src/main/java/org/openremote/agent/protocol/websocket/AbstractWebsocketClientProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/websocket/AbstractWebsocketClientProtocol.javaindex 1b4d342e3..00063c99c 100644--- a/agent/src/main/java/org/openremote/agent/protocol/websocket/AbstractWebsocketClientProtocol.java+++ b/agent/src/main/java/org/openremote/agent/protocol/websocket/AbstractWebsocketClientProtocol.java@@ -19,6 +19,7 @@*/package org.openremote.agent.protocol.websocket;+import com.fasterxml.jackson.core.type.TypeReference;import org.apache.http.HttpHeaders;import org.jboss.resteasy.client.jaxrs.ResteasyClient;import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget;@@ -179,7 +180,7 @@ public abstract class AbstractWebsocketClientProtocol<T> extends AbstractIoClien.flatMap(objectValue -> getMultivaluedMap(objectValue, true)).orElse(null);- Optional<WebsocketSubscription[]> subscriptions = getSubscriptions(protocolConfiguration);+ Optional<WebsocketSubscription<T>[]> subscriptions = getSubscriptions(protocolConfiguration);if (!oAuthGrant.isPresent() && usernameAndPassword.isPresent()) {String authValue = BasicAuthHelper.createHeader(usernameAndPassword.get().key.getString(), usernameAndPassword.get().value.getString());@@ -215,8 +216,8 @@ public abstract class AbstractWebsocketClientProtocol<T> extends AbstractIoClienprotected void doLinkAttribute(AssetAttribute attribute, AssetAttribute protocolConfiguration) {AttributeRef protocolRef = protocolConfiguration.getReferenceOrThrow();ProtocolIoClient<T, WebsocketIoClient<T>> protocolClient = protocolIoClientMap.get(protocolRef);- WebsocketIoClient client = protocolClient.client;- Optional<WebsocketSubscription[]> subscriptions = getSubscriptions(attribute);+ WebsocketIoClient<T> client = protocolClient.client;+ Optional<WebsocketSubscription<T>[]> subscriptions = getSubscriptions(attribute);subscriptions.ifPresent(websocketSubscriptions -> {MultivaluedMap<String, String> headers = clientHeaders.get(protocolRef);@@ -289,7 +290,7 @@ public abstract class AbstractWebsocketClientProtocol<T> extends AbstractIoClien}}- protected void doSubscriptions(AttributeRef protocolRef, WebsocketIoClient websocketClient, MultivaluedMap<String, String> headers, WebsocketSubscription[] subscriptions) {+ protected void doSubscriptions(AttributeRef protocolRef, WebsocketIoClient<T> websocketClient, MultivaluedMap<String, String> headers, WebsocketSubscription<T>[] subscriptions) {LOG.info("Executing subscriptions for websocket: " + websocketClient.getClientUri());// Inject OAuth header@@ -307,7 +308,7 @@ public abstract class AbstractWebsocketClientProtocol<T> extends AbstractIoClien);}- protected void doSubscription(WebsocketIoClient<String> websocketClient, MultivaluedMap<String, String> headers, WebsocketSubscription subscription) {+ protected void doSubscription(WebsocketIoClient<T> websocketClient, MultivaluedMap<String, String> headers, WebsocketSubscription<T> subscription) {if (subscription instanceof WebsocketHttpSubscription) {WebsocketHttpSubscription httpSubscription = (WebsocketHttpSubscription)subscription;@@ -373,7 +374,7 @@ public abstract class AbstractWebsocketClientProtocol<T> extends AbstractIoClien}}- protected static Optional<WebsocketSubscription[]> getSubscriptions(Attribute attribute) {+ protected static <T> Optional<WebsocketSubscription<T>[]> getSubscriptions(Attribute attribute) {return Values.getMetaItemValueOrThrow(attribute,META_SUBSCRIPTIONS,@@ -382,7 +383,7 @@ public abstract class AbstractWebsocketClientProtocol<T> extends AbstractIoClien.flatMap(Values::getArray).map(arrValue -> {try {- return Container.JSON.readValue(arrValue.toJson(), WebsocketSubscription[].class);+ return Container.JSON.readValue(arrValue.toJson(), new TypeReference<WebsocketSubscription<T>[]>() {});} catch (IOException e) {LOG.log(Level.WARNING, "Failed to deserialize WebsocketSubscription[]", e);return null;diff --git a/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketSubscription.java b/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketSubscription.javaindex a1fd595fb..d154239a9 100644--- a/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketSubscription.java+++ b/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketSubscription.java@@ -31,12 +31,12 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;property = "type",defaultImpl = WebsocketSubscription.class)-public class WebsocketSubscription {+public class WebsocketSubscription<T> {public static final String TYPE = "websocket";public String type = TYPE;- public String body;+ public T body;public WebsocketSubscription() {}@@ -45,7 +45,7 @@ public class WebsocketSubscription {this.type = type;}- public WebsocketSubscription body(String body) {+ public WebsocketSubscription<T> body(T body) {this.body = body;return this;}diff --git a/client/src/main/java/org/openremote/app/client/util/JsUtil.java b/client/src/main/java/org/openremote/app/client/util/JsUtil.javaindex 11d71afcc..b59b14bae 100644--- a/client/src/main/java/org/openremote/app/client/util/JsUtil.java+++ b/client/src/main/java/org/openremote/app/client/util/JsUtil.java@@ -23,6 +23,7 @@ import jsinterop.annotations.JsMethod;import java.util.List;+@SuppressWarnings("EqualityComparisonWithCoercionJS")public class JsUtil {public native static void log(Object o) /*-{@@ -43,6 +44,7 @@ public class JsUtil {}-*/;+ @SuppressWarnings("rawtypes")@JsMethod(namespace = "JsUtil")public static Object toJsArray(Object obj) {if (obj instanceof List) {diff --git a/container/src/main/java/org/openremote/container/message/MessageBrokerService.java b/container/src/main/java/org/openremote/container/message/MessageBrokerService.javaindex ba9bad6f4..4f5f081e6 100644--- a/container/src/main/java/org/openremote/container/message/MessageBrokerService.java+++ b/container/src/main/java/org/openremote/container/message/MessageBrokerService.java@@ -56,6 +56,7 @@ public class MessageBrokerService implements ContainerService {return PRIORITY;}+ @SuppressWarnings("deprecation")@Overridepublic void init(Container container) throws Exception {diff --git a/manager/src/main/java/org/openremote/manager/agent/AgentService.java b/manager/src/main/java/org/openremote/manager/agent/AgentService.javaindex dc922e7ae..b30afaddc 100644--- a/manager/src/main/java/org/openremote/manager/agent/AgentService.java+++ b/manager/src/main/java/org/openremote/manager/agent/AgentService.java@@ -134,8 +134,8 @@ public class AgentService extends RouteBuilder implements ContainerService, AsseclientEventService.addSubscriptionAuthorizer((auth, subscription) ->subscription.isEventType(AgentStatusEvent.class)&& identityService.getIdentityProvider()- .canSubscribeWith(auth, subscription.getFilter() instanceof TenantFilter- ? ((TenantFilter) subscription.getFilter())+ .canSubscribeWith(auth, subscription.getFilter() instanceof TenantFilter<?>+ ? ((TenantFilter<?>) subscription.getFilter()): null, ClientRole.READ_ASSETS));container.getService(ManagerWebService.class).getApiSingletons().add(@@ -202,8 +202,9 @@ public class AgentService extends RouteBuilder implements ContainerService, Asse.routeId("AgentPersistenceChanges").filter(isPersistenceEventForEntityType(Asset.class)).process(exchange -> {- PersistenceEvent persistenceEvent = exchange.getIn().getBody(PersistenceEvent.class);- Asset asset = (Asset) persistenceEvent.getEntity();+ @SuppressWarnings("unchecked")+ PersistenceEvent<Asset> persistenceEvent = (PersistenceEvent<Asset>)exchange.getIn().getBody(PersistenceEvent.class);+ Asset asset = persistenceEvent.getEntity();if (isPersistenceEventForAssetType(AGENT).matches(exchange)) {processAgentChange(asset, persistenceEvent);} else {@@ -238,7 +239,7 @@ public class AgentService extends RouteBuilder implements ContainerService, Asse}// Check protocol configuration has changed- @SuppressWarnings("ConstantConditions")+ @SuppressWarnings("OptionalGetWithoutIsPresent")AssetAttribute oldProtocolConfiguration = agent.getAttribute(protocolRef.getAttributeName()).get();if (oldProtocolConfiguration.equals(protocolConfiguration)) {// Protocol configuration hasn't changed so nothing to do here@@ -341,7 +342,7 @@ public class AgentService extends RouteBuilder implements ContainerService, Asse/*** Looks for new, modified and obsolete protocol configurations and links / unlinks any associated attributes*/- protected void processAgentChange(Asset agent, PersistenceEvent persistenceEvent) {+ protected void processAgentChange(Asset agent, PersistenceEvent<?> persistenceEvent) {LOG.finest("Processing agent persistence event: " + persistenceEvent.getCause());@@ -809,14 +810,12 @@ public class AgentService extends RouteBuilder implements ContainerService, Asse/*** Gets all agent link attributes and their linked protocol configuration and groups them by Protocol Configuration*/- @SuppressWarnings("ConstantConditions")protected Map<AssetAttribute, List<AssetAttribute>> getGroupedAgentLinkAttributes(Stream<AssetAttribute> attributes,Predicate<AssetAttribute> filter) {return getGroupedAgentLinkAttributes(attributes, filter, null);}- @SuppressWarnings("ConstantConditions")protected Map<AssetAttribute, List<AssetAttribute>> getGroupedAgentLinkAttributes(Stream<AssetAttribute> attributes,Predicate<AssetAttribute> filter,Consumer<AssetAttribute> notFoundConsumer) {diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.javaindex 8ea418c81..2f0ebee21 100644--- a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java+++ b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java@@ -1990,13 +1990,13 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic.filter(Optional::isPresent).map(Optional::get).collect(Collectors.toList());- TriggeredEventSubscription triggeredEventSubscription = new TriggeredEventSubscription(events, subscriptionId);+ TriggeredEventSubscription<?> triggeredEventSubscription = new TriggeredEventSubscription<>(events, subscriptionId);clientEventService.sendToSession(sessionKey, triggeredEventSubscription);}protected void replyWithAssetEvent(String sessionKey, String subscriptionId, Asset asset) {AssetEvent event = new AssetEvent(AssetEvent.Cause.READ, asset, null);- TriggeredEventSubscription triggeredEventSubscription = new TriggeredEventSubscription(Collections.singletonList(event), subscriptionId);+ TriggeredEventSubscription<?> triggeredEventSubscription = new TriggeredEventSubscription<>(Collections.singletonList(event), subscriptionId);clientEventService.sendToSession(sessionKey, triggeredEventSubscription);}diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesetStorageService.java b/manager/src/main/java/org/openremote/manager/rules/RulesetStorageService.javaindex bf71a6cdd..5a96afa56 100644--- a/manager/src/main/java/org/openremote/manager/rules/RulesetStorageService.java+++ b/manager/src/main/java/org/openremote/manager/rules/RulesetStorageService.java@@ -257,10 +257,11 @@ public class RulesetStorageService implements ContainerService {protected void appendLimit(StringBuilder sb, RulesetQuery query) {if (query.limit > 0) {- sb.append(" LIMIT " + query.limit);+ sb.append(" LIMIT ").append(query.limit);}}+ @SuppressWarnings("unchecked")protected <T extends Ruleset> T mapResultTuple(Class<T> rulesetType, RulesetQuery query, ResultSet rs) throws SQLException {T ruleset;@@ -270,13 +271,13 @@ public class RulesetStorageService implements ContainerService {TenantRuleset tenantRuleset = new TenantRuleset();tenantRuleset.setRealm(rs.getString("REALM"));tenantRuleset.setAccessPublicRead(rs.getBoolean("ACCESS_PUBLIC_READ"));- ruleset = (T)tenantRuleset;+ ruleset = (T) tenantRuleset;} else if (rulesetType == AssetRuleset.class) {AssetRuleset assetRuleset = new AssetRuleset();assetRuleset.setAssetId(rs.getString("ASSET_ID"));assetRuleset.setRealm(rs.getString("REALM"));assetRuleset.setAccessPublicRead(rs.getBoolean("ACCESS_PUBLIC_READ"));- ruleset = (T)assetRuleset;+ ruleset = (T) assetRuleset;} else {throw new UnsupportedOperationException("Ruleset type not supported: " + rulesetType);}diff --git a/manager/src/main/java/org/openremote/manager/setup/SetupService.java b/manager/src/main/java/org/openremote/manager/setup/SetupService.javaindex e5b153b8d..8b516e8c0 100644--- a/manager/src/main/java/org/openremote/manager/setup/SetupService.java+++ b/manager/src/main/java/org/openremote/manager/setup/SetupService.java@@ -21,19 +21,15 @@ package org.openremote.manager.setup;import org.openremote.container.Container;import org.openremote.container.ContainerService;-import org.openremote.container.message.MessageBrokerService;import org.openremote.container.security.IdentityService;import org.openremote.container.timer.TimerService;import org.openremote.manager.setup.builtin.BuiltinSetupTasks;-import sun.plugin2.message.Message;import java.util.ArrayList;import java.util.List;import java.util.ServiceLoader;import java.util.logging.Logger;-import static org.openremote.manager.agent.AgentService.AGENT_SERVICE_PRIORITY;-/*** Executes setup tasks for a clean installation when the application starts.* <p>