From d95c8861a576b4a6d08c0a27ac3e1e23d1a033ca Mon Sep 17 00:00:00 2001 From: oklishch Date: Wed, 5 Oct 2016 22:15:51 +0300 Subject: [PATCH] Fixed some warns. --- ...tionUserVerifierActorMessageProcessor.java | 10 +++ ...AbstractEndpointActorMessageProcessor.java | 12 +++ .../endpoint/AbstractEndpointActorState.java | 3 + .../GlobalEndpointActorMessageProcessor.java | 13 +++ .../LocalEndpointActorMessageProcessor.java | 81 ++++++++++++++++++- .../local/LocalEndpointActorState.java | 17 +++- .../core/endpoint/SyncRequestMessage.java | 5 ++ .../user/EndpointEventReceiveMessage.java | 2 + .../user/EndpointUserConfigurationUpdate.java | 3 + .../core/user/UserConfigurationUpdate.java | 3 + .../operations/service/event/RouteTable.java | 11 +++ .../datamigration/UpdateUuidsMigration.java | 4 + 12 files changed, 160 insertions(+), 4 deletions(-) diff --git a/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/akka/actors/core/ApplicationUserVerifierActorMessageProcessor.java b/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/akka/actors/core/ApplicationUserVerifierActorMessageProcessor.java index 27c3e7630f..d639d9c3d8 100644 --- a/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/akka/actors/core/ApplicationUserVerifierActorMessageProcessor.java +++ b/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/akka/actors/core/ApplicationUserVerifierActorMessageProcessor.java @@ -98,6 +98,11 @@ private UserVerifier createUserVerifier(UserVerifierDto verifierDto) throws Exce } } + /** + * Verifies a user. + * + * @param message user verification request message + */ public void verifyUser(UserVerificationRequestMessage message) { UserVerifier verifier = userVerifiers.get(message.getVerifierId()); if (verifier != null) { @@ -111,6 +116,11 @@ public void verifyUser(UserVerificationRequestMessage message) { } } + /** + * Process a notification. + * + * @param notification notification + */ public void processNotification(Notification notification) { LOG.debug("Process user verifier notification [{}]", notification); String verifierToken = notification.getUserVerifierToken(); diff --git a/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/akka/actors/core/endpoint/AbstractEndpointActorMessageProcessor.java b/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/akka/actors/core/endpoint/AbstractEndpointActorMessageProcessor.java index 5ea13991e8..4644e64c48 100644 --- a/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/akka/actors/core/endpoint/AbstractEndpointActorMessageProcessor.java +++ b/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/akka/actors/core/endpoint/AbstractEndpointActorMessageProcessor.java @@ -78,6 +78,12 @@ public long getInactivityTimeout() { return inactivityTimeout; } + /** + * Process an actor timeout message. + * + * @param context actor context + * @param message actor timeout message + */ public void processActorTimeoutMessage(ActorContext context, ActorTimeoutMessage message) { if (state.getLastActivityTime() <= message.getLastActivityTime()) { LOG.debug("[{}][{}] Request stop of endpoint actor due to inactivity timeout", @@ -94,6 +100,12 @@ protected void tellActor(ActorContext context, ActorRef target, Object message) target.tell(message, context.self()); } + /** + * Process an endpoint actor message. + * + * @param context actor context + * @param msg endpoint actor message + */ public void processEndpointActorMsg(ActorContext context, EndpointActorMsg msg) { if (msg instanceof ThriftEndpointActorMsg) { processThriftMsg(context, (ThriftEndpointActorMsg) msg); diff --git a/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/akka/actors/core/endpoint/AbstractEndpointActorState.java b/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/akka/actors/core/endpoint/AbstractEndpointActorState.java index 37b9099c3d..dbb4106087 100644 --- a/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/akka/actors/core/endpoint/AbstractEndpointActorState.java +++ b/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/akka/actors/core/endpoint/AbstractEndpointActorState.java @@ -22,6 +22,9 @@ public abstract class AbstractEndpointActorState { protected final String actorKey; private long lastActivityTime; + /** + * All-args constructor. + */ public AbstractEndpointActorState(String endpointKey, String actorKey) { super(); this.endpointKey = endpointKey; diff --git a/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/akka/actors/core/endpoint/global/GlobalEndpointActorMessageProcessor.java b/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/akka/actors/core/endpoint/global/GlobalEndpointActorMessageProcessor.java index 5f55bbaa04..70ff84ed77 100644 --- a/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/akka/actors/core/endpoint/global/GlobalEndpointActorMessageProcessor.java +++ b/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/akka/actors/core/endpoint/global/GlobalEndpointActorMessageProcessor.java @@ -49,6 +49,9 @@ public class GlobalEndpointActorMessageProcessor private final ClusterService clusterService; private final OperationsService operationsService; + /** + * All-args constructor. + */ public GlobalEndpointActorMessageProcessor(AkkaContext context, String appToken, EndpointObjectHash key, String actorKey) { super(new GlobalEndpointActorState(Base64Util.encode(key.getData()), actorKey), @@ -62,6 +65,11 @@ public GlobalEndpointActorMessageProcessor(AkkaContext context, String appToken, routes = new RouteTable<>(nodeId); } + /** + * Process an endpoint route message. + * + * @param message endpoint route message + */ public void processRouteMessage(EndpointRouteMessage message) { LOG.debug("[{}] Processing {} operation for address {}", endpointKey, message.getOperation(), message.getAddress()); @@ -78,6 +86,11 @@ public void processRouteMessage(EndpointRouteMessage message) { } } + /** + * Process a cluster update. + * + * @param context actor context + */ public void processClusterUpdate(ActorContext context) { if (!clusterService.isMainEntityNode(key)) { LOG.debug("[{}] No longer a global endpoint node for {}", endpointKey); diff --git a/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/akka/actors/core/endpoint/local/LocalEndpointActorMessageProcessor.java b/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/akka/actors/core/endpoint/local/LocalEndpointActorMessageProcessor.java index 6a02426ebe..259504de0b 100644 --- a/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/akka/actors/core/endpoint/local/LocalEndpointActorMessageProcessor.java +++ b/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/akka/actors/core/endpoint/local/LocalEndpointActorMessageProcessor.java @@ -108,7 +108,9 @@ public class LocalEndpointActorMessageProcessor private final Map userAttachResponseMap; - + /** + * All-args constructor. + */ public LocalEndpointActorMessageProcessor(AkkaContext context, String appToken, EndpointObjectHash key, @@ -123,10 +125,22 @@ public LocalEndpointActorMessageProcessor(AkkaContext context, this.userAttachResponseMap = new LinkedHashMap<>(); } + /** + * Process an endpoint sync. + * + * @param context actor context + * @param message sync request message + */ public void processEndpointSync(ActorContext context, SyncRequestMessage message) { sync(context, message); } + /** + * Process an endpoint event receive message. + * + * @param context actor context + * @param message endpoint event receive message + */ public void processEndpointEventReceiveMessage(ActorContext context, EndpointEventReceiveMessage message) { EndpointEventDeliveryMessage response; @@ -153,6 +167,11 @@ public void processEndpointEventReceiveMessage(ActorContext context, tellParent(context, response); } + /** + * Process a thrift notification. + * + * @param context actor context. + */ public void processThriftNotification(ActorContext context) { Set channels = state.getChannelsByTypes( TransportType.CONFIGURATION, TransportType.NOTIFICATION); @@ -161,6 +180,12 @@ public void processThriftNotification(ActorContext context) { syncChannels(context, channels, true, true); } + /** + * Process a user configuration update message. + * + * @param context actor context + * @param message endpoint user configuration update message + */ public void processUserConfigurationUpdate(ActorContext context, EndpointUserConfigurationUpdateMessage message) { if (message.getUserConfigurationUpdate() != null) { @@ -210,6 +235,12 @@ private void processEndpointDeregistrationMessage( } } + /** + * Process a notification message. + * + * @param context actor context + * @param message notification message + */ public void processNotification(ActorContext context, NotificationMessage message) { LOG.debug("[{}][{}] Processing notification message {}", endpointKey, actorKey, message); @@ -242,6 +273,12 @@ public void processNotification(ActorContext context, NotificationMessage messag } } + /** + * Process a request timeout message. + * + * @param context actor context + * @param message request timeout message + */ public void processRequestTimeoutMessage(ActorContext context, RequestTimeoutMessage message) { ChannelMetaData channel = state.getChannelByRequestId(message.getRequestId()); if (channel != null) { @@ -338,7 +375,7 @@ private SyncContext sync(ClientSync request) throws GetDeltaException { if (context.getStatus() != SyncStatus.SUCCESS) { return context; } - if (state.isUcfHashRequiresIntialization()) { + if (state.isUcfHashRequiresInitialization()) { byte[] hash = operationsService.fetchUcfHash(appToken, state.getProfile()); LOG.debug("[{}][{}] Initialized endpoint user configuration hash {}", endpointKey, context.getRequestHash(), @@ -779,6 +816,12 @@ protected void sendEventsIfPresent(ActorContext context, EventClientSync request } } + /** + * Process an endpoint user action message. + * + * @param context actor context + * @param message endpoint user action message + */ public void processEndpointUserActionMessage(ActorContext context, EndpointUserActionMessage message) { Set eventChannels = state.getChannelsByTypes( @@ -836,6 +879,13 @@ public void processEndpointUserActionMessage(ActorContext context, } } + /** + * Process disconnect message. + * + * @param context actor context + * @param message channel aware message + * @return true if channel is disconnected otherwise false + */ public boolean processDisconnectMessage(ActorContext context, ChannelAware message) { LOG.debug("[{}][{}] Received disconnect message for channel [{}]", endpointKey, actorKey, message.getChannelUuid()); @@ -851,6 +901,13 @@ public boolean processDisconnectMessage(ActorContext context, ChannelAware messa } } + /** + * Process a ping message. + * + * @param context actor context + * @param message channel aware message + * @return true if channel is found otherwise false + */ public boolean processPingMessage(ActorContext context, ChannelAware message) { LOG.debug("[{}][{}] Received ping message for channel [{}]", endpointKey, actorKey, message.getChannelUuid()); @@ -870,6 +927,14 @@ public boolean processPingMessage(ActorContext context, ChannelAware message) { } } + /** + * + * Process a timeout message. + * + * @param context actor context + * @param message channel timeout message + * @return true if channel is removed otherwise false + */ public boolean processChannelTimeoutMessage(ActorContext context, ChannelTimeoutMessage message) { LOG.debug("[{}][{}] Received channel timeout message for channel [{}]", @@ -900,6 +965,12 @@ public boolean processChannelTimeoutMessage(ActorContext context, } } + /** + * Process a log delivery message. + * + * @param context actor context + * @param message log delivery message + */ public void processLogDeliveryMessage(ActorContext context, LogDeliveryMessage message) { LOG.debug("[{}][{}] Received log delivery message for request [{}] with status {}", endpointKey, actorKey, message.getRequestId(), @@ -921,6 +992,12 @@ public void processLogDeliveryMessage(ActorContext context, LogDeliveryMessage m logUploadResponseMap.clear(); } + /** + * Process a user verification message. + * + * @param context actor context + * @param message user verification response message + */ public void processUserVerificationMessage(ActorContext context, UserVerificationResponseMessage message) { LOG.debug("[{}][{}] Received user verification message for request [{}] with status {}", diff --git a/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/akka/actors/core/endpoint/local/LocalEndpointActorState.java b/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/akka/actors/core/endpoint/local/LocalEndpointActorState.java index e0a6c1a04b..3910884814 100644 --- a/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/akka/actors/core/endpoint/local/LocalEndpointActorState.java +++ b/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/akka/actors/core/endpoint/local/LocalEndpointActorState.java @@ -49,6 +49,9 @@ public class LocalEndpointActorState extends AbstractEndpointActorState { private boolean ucfHashIntialized; private byte[] ucfHash; + /** + * All-args constructor. + */ public LocalEndpointActorState(String endpointKey, String actorKey) { super(endpointKey, actorKey); this.channelMap = new ChannelMap(endpointKey, actorKey); @@ -171,12 +174,22 @@ public void setSubscriptionStates(Map subscriptionStates) { this.subscriptionStates = new HashMap<>(subscriptionStates); } - public boolean isUcfHashRequiresIntialization() { + /** + * Returns whether hash requires initialization. + * + * @return true if hash requires initialization otherwise false + */ + public boolean isUcfHashRequiresInitialization() { return isValidForUser() && !ucfHashIntialized; } + /** + * Returns whether user configuration update is pending. + * + * @return true if user configuration update is pending otherwise false + */ public boolean isUserConfigurationUpdatePending() { - if (!isValidForUser() || isUcfHashRequiresIntialization()) { + if (!isValidForUser() || isUcfHashRequiresInitialization()) { return false; } return !Arrays.equals(ucfHash, endpointProfile.getUserConfigurationHash()); diff --git a/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/akka/messages/core/endpoint/SyncRequestMessage.java b/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/akka/messages/core/endpoint/SyncRequestMessage.java index 2b21d7d0ae..4052698a44 100644 --- a/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/akka/messages/core/endpoint/SyncRequestMessage.java +++ b/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/akka/messages/core/endpoint/SyncRequestMessage.java @@ -249,6 +249,11 @@ private NotificationClientSync diff(NotificationClientSync oldRequest, } } + /** + * Returns whether a transport a type is valid. + * @param type transport type + * @return true if type is valid otherwise false + */ public boolean isValid(TransportType type) { switch (type) { case EVENT: diff --git a/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/akka/messages/core/user/EndpointEventReceiveMessage.java b/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/akka/messages/core/user/EndpointEventReceiveMessage.java index 0fa6cb86ac..9305035ca6 100644 --- a/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/akka/messages/core/user/EndpointEventReceiveMessage.java +++ b/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/akka/messages/core/user/EndpointEventReceiveMessage.java @@ -62,7 +62,9 @@ public List getEndpointEvents() { return events; } + //CHECKSTYLE:OFF public List getEvents() { + //CHECKSTYLE:ON List result = new ArrayList<>(events.size()); for (EndpointEvent event : events) { result.add(event.getEvent()); diff --git a/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/akka/messages/core/user/EndpointUserConfigurationUpdate.java b/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/akka/messages/core/user/EndpointUserConfigurationUpdate.java index 3e91579850..1d0107c7c7 100644 --- a/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/akka/messages/core/user/EndpointUserConfigurationUpdate.java +++ b/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/akka/messages/core/user/EndpointUserConfigurationUpdate.java @@ -41,6 +41,9 @@ public EndpointUserConfigurationUpdate(String tenantId, String userId, String ap this.hash = hash; } + /** + * All-args constructor. + */ public static EndpointUserConfigurationUpdate fromThrift( org.kaaproject.kaa.server.common.thrift.gen.operations.EndpointStateUpdate notification) { return new EndpointUserConfigurationUpdate(notification.getTenantId(), notification.getUserId(), diff --git a/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/akka/messages/core/user/UserConfigurationUpdate.java b/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/akka/messages/core/user/UserConfigurationUpdate.java index 3c2371e672..64e26567f5 100644 --- a/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/akka/messages/core/user/UserConfigurationUpdate.java +++ b/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/akka/messages/core/user/UserConfigurationUpdate.java @@ -39,6 +39,9 @@ public UserConfigurationUpdate(String tenantId, String userId, String applicatio this.hash = hash; } + /** + * All-args constructor. + */ public static UserConfigurationUpdate fromThrift( org.kaaproject.kaa.server.common.thrift.gen.operations.UserConfigurationUpdate notification) { return new UserConfigurationUpdate(notification.getTenantId(), notification.getUserId(), diff --git a/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/event/RouteTable.java b/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/event/RouteTable.java index 0505bd38e4..3cad65aaac 100644 --- a/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/event/RouteTable.java +++ b/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/event/RouteTable.java @@ -177,6 +177,12 @@ public boolean isDeliveryRequired(String serverId, RouteTableAddress address) { return servers == null || !servers.contains(serverId); } + /** + * Remove a local address. + * + * @param endpoint endpoint object hash + * @return removed address + */ public RouteTableAddress removeLocal(EndpointObjectHash endpoint) { clearRoutes(endpoint); RouteTableAddress addressToRemove = null; @@ -252,6 +258,11 @@ private void clearReportedAddressMap(String serverId) { } } + /** + * Remove a route table address. + * + * @param address address + */ public void removeByAddress(RouteTableAddress address) { Set>> entrySet = routes.entrySet(); Iterator>> iterator = entrySet.iterator(); diff --git a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/UpdateUuidsMigration.java b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/UpdateUuidsMigration.java index 7e0e282cb5..b4d3fde9e3 100644 --- a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/UpdateUuidsMigration.java +++ b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/UpdateUuidsMigration.java @@ -70,6 +70,10 @@ public UpdateUuidsMigration(Connection connection, Options options) { this.nosql = options.getNoSql(); } + /** + * Change encoding of uuids from Latin1 to Base64 in relational and NoSQL databases. + * + */ public void transform() throws IOException, SQLException { QueryRunner run = new QueryRunner(); ResultSetHandler> rsHandler = new BeanListHandler<>(Configuration.class);