diff --git a/client/client-multi/client-java-android/src/main/java/org/kaaproject/kaa/client/logging/AndroidSqLiteDqLogStorage.java b/client/client-multi/client-java-android/src/main/java/org/kaaproject/kaa/client/logging/AndroidSqLiteDqLogStorage.java index 3a01adcd32..eb215875bb 100644 --- a/client/client-multi/client-java-android/src/main/java/org/kaaproject/kaa/client/logging/AndroidSqLiteDqLogStorage.java +++ b/client/client-multi/client-java-android/src/main/java/org/kaaproject/kaa/client/logging/AndroidSqLiteDqLogStorage.java @@ -58,10 +58,16 @@ public class AndroidSqLiteDqLogStorage implements LogStorage, LogStorageStatus { private SQLiteStatement updateBucketStateStatement; private SQLiteStatement resetBucketIdStatement; + /** + * Instantiates the AndroidSqLiteDqLogStorage. + */ public AndroidSqLiteDqLogStorage(Context context, long maxBucketSize, int maxRecordCount) { this(context, PersistentLogStorageConstants.DEFAULT_DB_NAME, maxBucketSize, maxRecordCount); } + /** + * Instantiates the AndroidSqLiteDqLogStorage. + */ public AndroidSqLiteDqLogStorage(Context context, String dbName, long bucketSize, int recordCount) { Log.i(TAG, "Connecting to db with name: " + dbName); @@ -245,8 +251,8 @@ public void removeBucket(int recordBlockId) { if (removedRecordsCount > 0) { totalRecordCount -= removedRecordsCount; - Log.i(TAG, "Removed " + removedRecordsCount + - " records from storage. Total log record count: " + totalRecordCount); + Log.i(TAG, "Removed " + removedRecordsCount + + " records from storage. Total log record count: " + totalRecordCount); } else { Log.i(TAG, "No records were removed from storage"); } diff --git a/client/client-multi/client-java-android/src/main/java/org/kaaproject/kaa/client/transport/ByteArrayBody.java b/client/client-multi/client-java-android/src/main/java/org/kaaproject/kaa/client/transport/ByteArrayBody.java index dee76cafc5..5b01a2c771 100644 --- a/client/client-multi/client-java-android/src/main/java/org/kaaproject/kaa/client/transport/ByteArrayBody.java +++ b/client/client-multi/client-java-android/src/main/java/org/kaaproject/kaa/client/transport/ByteArrayBody.java @@ -28,6 +28,9 @@ public class ByteArrayBody extends AbstractContentBody { private final String filename; + /** + * All-args constructor. + */ public ByteArrayBody(final byte[] data, final String mimeType, final String filename) { super(mimeType); if (data == null) { diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/KaaClientProperties.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/KaaClientProperties.java index 5f6593eecf..1d14174c39 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/KaaClientProperties.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/KaaClientProperties.java @@ -104,6 +104,11 @@ private static void checkNotBlankProperty(String fileName, String errorMessage) } } + /** + * Calculates a hash for SDK properties. + * + * @return hash for SDK properties + */ public byte[] getPropertiesHash() { if (propertiesHash == null) { try { diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/bootstrap/DefaultBootstrapManager.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/bootstrap/DefaultBootstrapManager.java index b02a248308..6d5012ae53 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/bootstrap/DefaultBootstrapManager.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/bootstrap/DefaultBootstrapManager.java @@ -65,6 +65,9 @@ public class DefaultBootstrapManager implements BootstrapManager { private Integer serverToApply; private ExecutorContext executorContext; + /** + * All-args constructor. + */ public DefaultBootstrapManager(BootstrapTransport transport, ExecutorContext executorContext, FailureListener failureListener) { this.transport = transport; diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/GenericTransportInfo.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/GenericTransportInfo.java index aaece8125b..e32bb54138 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/GenericTransportInfo.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/GenericTransportInfo.java @@ -30,6 +30,9 @@ public class GenericTransportInfo implements TransportConnectionInfo { protected final TransportProtocolId transportId; protected final ProtocolMetaData md; + /** + * All-args constructor. + */ public GenericTransportInfo(ServerType serverType, ProtocolMetaData md) { super(); this.serverType = serverType; diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/IpTransportInfo.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/IpTransportInfo.java index e8ba09f41e..6af7d428e4 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/IpTransportInfo.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/IpTransportInfo.java @@ -36,6 +36,9 @@ public class IpTransportInfo extends GenericTransportInfo { private final int port; private final PublicKey publicKey; + /** + * All-args constructor. + */ public IpTransportInfo(TransportConnectionInfo parent) { super(parent.getServerType(), new ProtocolMetaData(parent.getAccessPointId(), new ProtocolVersionPair(parent.getTransportId() diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/TransportProtocolId.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/TransportProtocolId.java index bdcf27c471..dc50ef7029 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/TransportProtocolId.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/TransportProtocolId.java @@ -27,6 +27,9 @@ public final class TransportProtocolId { private final int id; private final int version; + /** + * All-args constructor. + */ public TransportProtocolId(int protocolId, int protocolVersion) { super(); this.id = protocolId; diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/failover/DefaultFailoverManager.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/failover/DefaultFailoverManager.java index e3f59099cb..79df7db1a0 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/failover/DefaultFailoverManager.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/failover/DefaultFailoverManager.java @@ -48,6 +48,9 @@ public DefaultFailoverManager(KaaChannelManager channelManager, ExecutorContext DEFAULT_FAILURE_RESOLUTION_TIMEOUT, DEFAULT_TIME_UNIT); } + /** + * All-args constructor. + */ public DefaultFailoverManager(KaaChannelManager channelManager, ExecutorContext context, FailoverStrategy failoverStrategy, diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/failover/FailoverDecision.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/failover/FailoverDecision.java index eb4cedda9c..a5cd68c58c 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/failover/FailoverDecision.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/failover/FailoverDecision.java @@ -33,6 +33,9 @@ public FailoverDecision(FailoverAction action) { this.action = action; } + /** + * All-args constructor. + */ public FailoverDecision(FailoverAction action, long retryPeriod, TimeUnit timeUnit) { this.action = action; this.retryPeriod = retryPeriod; diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/failover/strategies/DefaultFailoverStrategy.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/failover/strategies/DefaultFailoverStrategy.java index a7863fe05b..a3201b6f18 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/failover/strategies/DefaultFailoverStrategy.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/failover/strategies/DefaultFailoverStrategy.java @@ -42,6 +42,9 @@ public class DefaultFailoverStrategy implements FailoverStrategy { private long noConnectivityRetryPeriod; private TimeUnit timeUnit; + /** + * Instantiates the DelautFailoverStrategy. + */ public DefaultFailoverStrategy() { this(DEFAULT_BOOTSTRAP_SERVERS_RETRY_PERIOD, DEFAULT_OPERATION_SERVERS_RETRY_PERIOD, @@ -49,6 +52,9 @@ public DefaultFailoverStrategy() { DEFAULT_TIME_UNIT); } + /** + * All-args constructor. + */ public DefaultFailoverStrategy(long bootstrapServersRetryPeriod, long operationsServersRetryPeriod, long noConnectivityRetryPeriod, diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/DefaultChannelManager.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/DefaultChannelManager.java index e78113b45d..fd956189fe 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/DefaultChannelManager.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/DefaultChannelManager.java @@ -72,6 +72,9 @@ public class DefaultChannelManager implements KaaInternalChannelManager { private KaaDataMultiplexer bootstrapMultiplexer; private KaaDataDemultiplexer bootstrapDemultiplexer; + /** + * All-args constructor. + */ public DefaultChannelManager(BootstrapManager manager, Map> bootststrapServers, ExecutorContext executorContext, FailureListener failureListener) { diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/AbstractHttpChannel.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/AbstractHttpChannel.java index 85e790a84b..4b7a040cfb 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/AbstractHttpChannel.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/AbstractHttpChannel.java @@ -61,6 +61,9 @@ public abstract class AbstractHttpChannel implements KaaDataChannel { private KaaDataDemultiplexer demultiplexer; private KaaDataMultiplexer multiplexer; + /** + * All-args constructor. + */ public AbstractHttpChannel(AbstractKaaClient client, KaaClientState state, FailoverManager failoverManager) { this.client = client; diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/DefaultOperationTcpChannel.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/DefaultOperationTcpChannel.java index ac8ffc4d6c..d5a46eacca 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/DefaultOperationTcpChannel.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/DefaultOperationTcpChannel.java @@ -215,6 +215,9 @@ public void run() { } }; + /** + * All-args constructor. + */ public DefaultOperationTcpChannel(KaaClientState state, FailoverManager failoverManager, FailureListener failureListener) { this.state = state; diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/DefaultOperationsChannel.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/DefaultOperationsChannel.java index c034ce440e..595ab9233d 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/DefaultOperationsChannel.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/DefaultOperationsChannel.java @@ -115,6 +115,9 @@ protected void executeCommand() { private volatile boolean isShutdown = false; private volatile boolean isPaused = false; + /** + * All-args constructor. + */ public DefaultOperationsChannel(AbstractKaaClient client, KaaClientState state, FailoverManager failoverManager) { this.client = client; diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/polling/CancelableCommandRunnable.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/polling/CancelableCommandRunnable.java index 6be5a70f14..e976d7e2c7 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/polling/CancelableCommandRunnable.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/polling/CancelableCommandRunnable.java @@ -37,6 +37,9 @@ public void run() { } } + /** + * Waits until a command executed. + */ public void waitUntilExecuted() { while (isRunning) { synchronized (this) { diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/polling/PollCommand.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/polling/PollCommand.java index 735e4b649c..051c65666f 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/polling/PollCommand.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/channels/polling/PollCommand.java @@ -37,6 +37,9 @@ public class PollCommand implements Command { private final IpTransportInfo serverInfo; private volatile boolean canceled = false; + /** + * All-args constructor. + */ public PollCommand(AbstractHttpClient client, RawDataProcessor processor, Map transportTypes, IpTransportInfo serverInfo) { this.httpClient = client; diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/sync/SyncTask.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/sync/SyncTask.java index 0e9a82e3f0..f7b535930c 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/sync/SyncTask.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/channel/impl/sync/SyncTask.java @@ -28,10 +28,16 @@ public class SyncTask { private final boolean ackOnly; private final boolean all; + /** + * Instantiates the SyncTask. + */ public SyncTask(TransportType type, boolean ackOnly, boolean all) { this(Collections.singleton(type), ackOnly, all); } + /** + * Instantiates the SyncTask. + */ public SyncTask(Set types, boolean ackOnly, boolean all) { super(); this.types = types; @@ -39,8 +45,15 @@ public SyncTask(Set types, boolean ackOnly, boolean all) { this.all = all; } + /** + * Merges sync tasks. + * + * @param syncTask sync task + * @param additionalTasks additional sync tasks + * @return merged sync task + */ public static SyncTask merge(SyncTask syncTask, List additionalTasks) { - Set types = new HashSet(); + Set types = new HashSet<>(); types.addAll(syncTask.types); boolean ack = syncTask.ackOnly; boolean all = syncTask.all; diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/configuration/base/AbstractConfigurationManager.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/configuration/base/AbstractConfigurationManager.java index ae936e91ec..0a865900ea 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/configuration/base/AbstractConfigurationManager.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/configuration/base/AbstractConfigurationManager.java @@ -45,6 +45,9 @@ public abstract class AbstractConfigurationManager implements ConfigurationManag private ConfigurationHashContainer container = new HashContainer(); private KaaClientState state; + /** + * All-args constructor. + */ public AbstractConfigurationManager(KaaClientProperties properties, KaaClientState state, ExecutorContext executorContext) { super(); diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/context/SimpleExecutorContext.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/context/SimpleExecutorContext.java index 6ab22d0028..504306b3be 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/context/SimpleExecutorContext.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/context/SimpleExecutorContext.java @@ -48,6 +48,9 @@ public SimpleExecutorContext() { this(SINGLE_THREAD, SINGLE_THREAD, SINGLE_THREAD, SINGLE_THREAD); } + /** + * All-args constructor. + */ public SimpleExecutorContext(int lifeCycleThreadCount, int apiThreadCount, int callbackThreadCount, int scheduledThreadCount) { super(); diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/context/TransportContext.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/context/TransportContext.java index acc5e44da1..9c655b4091 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/context/TransportContext.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/context/TransportContext.java @@ -43,6 +43,9 @@ public final class TransportContext { private final RedirectionTransport redirectionTransport; private final LogTransport logTransport; + /** + * All-args constructor. + */ public TransportContext(MetaDataTransport mdTransport, BootstrapTransport bootstrapTransport, ProfileTransport profileTransport, EventTransport eventTransport, NotificationTransport notificationTransport, @@ -97,6 +100,12 @@ public LogTransport getLogTransport() { return logTransport; } + /** + * Initialize transports. + * + * @param channelManager channel manager + * @param clientState kaa client state + */ public void initTransports(KaaChannelManager channelManager, KaaClientState clientState) { for (KaaTransport transport : Arrays.asList(bootstrapTransport, profileTransport, eventTransport, notificationTransport, configurationTransport, userTransport, diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/event/DefaultEventManager.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/event/DefaultEventManager.java index e6bca47aca..d96345431d 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/event/DefaultEventManager.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/event/DefaultEventManager.java @@ -58,6 +58,9 @@ public class DefaultEventManager implements EventManager { private final Map> transactions = new HashMap<>(); private Boolean isEngaged = false; + /** + * All-args constructor. + */ public DefaultEventManager(KaaClientState state, ExecutorContext executorContext, EventTransport transport) { this.state = state; diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/event/registration/DefaultEndpointRegistrationManager.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/event/registration/DefaultEndpointRegistrationManager.java index 49c421a242..984183afc7 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/event/registration/DefaultEndpointRegistrationManager.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/event/registration/DefaultEndpointRegistrationManager.java @@ -68,6 +68,9 @@ public class DefaultEndpointRegistrationManager implements EndpointRegistrationM private volatile UserTransport userTransport; private volatile ProfileTransport profileTransport; + /** + * All-args constructor. + */ public DefaultEndpointRegistrationManager(KaaClientState state, ExecutorContext executorContext, UserTransport userTransport, ProfileTransport profileTransport) { @@ -88,6 +91,12 @@ private String regenerateEndpointAccessToken() { return newEndpointAccessToken; } + + /** + * Updates an endpoint access token. + * + * @param token new endpoint access token + */ public void updateEndpointAccessToken(String token) { state.setEndpointAccessToken(token); state.setIfNeedProfileResync(true); diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/logging/AbstractLogCollector.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/logging/AbstractLogCollector.java index 483ec9ce05..e31809eaaf 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/logging/AbstractLogCollector.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/logging/AbstractLogCollector.java @@ -66,6 +66,9 @@ public abstract class AbstractLogCollector implements LogCollector, LogProcessor private LogDeliveryListener logDeliveryListener; private boolean uploadCheckInProgress = false; + /** + * All-args constructor. + */ public AbstractLogCollector(LogTransport transport, ExecutorContext executorContext, KaaChannelManager channelManager, FailoverManager failoverManager) { this.strategy = new DefaultLogUploadStrategy(); diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/logging/future/ExecutionResult.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/logging/future/ExecutionResult.java index cc20d8f36b..fc52de1e69 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/logging/future/ExecutionResult.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/logging/future/ExecutionResult.java @@ -21,6 +21,9 @@ public class ExecutionResult { private final T obj; private final Exception ex; + /** + * All-args constructor. + */ public ExecutionResult(T obj, Exception ex) { super(); this.obj = obj; diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/logging/future/RecordFuture.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/logging/future/RecordFuture.java index f0c5a18348..1f455517fc 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/logging/future/RecordFuture.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/logging/future/RecordFuture.java @@ -88,6 +88,12 @@ public boolean equals(Object obj) { return true; } + /** + * Sets value. + * + * @param value value + * @param arriveTime arrive time + */ public void setValue(RecordInfo value, Long arriveTime) { try { value.setRecordAddedTimestampMs(recordAddedTimestampMs); diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/logging/memory/MemBucket.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/logging/memory/MemBucket.java index f4d132a7dc..eb0b5d7bf0 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/logging/memory/MemBucket.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/logging/memory/MemBucket.java @@ -33,6 +33,9 @@ public class MemBucket { protected long size; private MemBucketState state; + /** + * All-args constructor. + */ public MemBucket(int id, long maxSize, int maxRecordCount) { super(); this.id = id; @@ -66,6 +69,12 @@ public void setState(MemBucketState state) { this.state = state; } + /** + * Adds a record to a bucket. + * + * @param record record + * @return true if record is added otherwise false + */ public boolean addRecord(LogRecord record) { if (size + record.getSize() > maxSize) { LOG.trace("No space left in bucket. Current size: {}, record size: {}, max size: {}", diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/logging/memory/MemLogStorage.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/logging/memory/MemLogStorage.java index b7d82bf62f..b141b4051c 100644 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/logging/memory/MemLogStorage.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/logging/memory/MemLogStorage.java @@ -54,6 +54,9 @@ public MemLogStorage(long bucketSize, int bucketRecordCount) { this(DEFAULT_MAX_STORAGE_SIZE, bucketSize, bucketRecordCount); } + /** + * All-args constructor. + */ public MemLogStorage(long maxStorageSize, long bucketSize, int bucketRecordCount) { super(); this.maxStorageSize = maxStorageSize; diff --git a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/notification/DefaultNotificationManager.java b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/notification/DefaultNotificationManager.java index d8e768d190..6170a826c4 100755 --- a/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/notification/DefaultNotificationManager.java +++ b/client/client-multi/client-java-core/src/main/java/org/kaaproject/kaa/client/notification/DefaultNotificationManager.java @@ -55,6 +55,9 @@ public class DefaultNotificationManager implements NotificationManager, Notifica private Map topics = new HashMap<>(); private volatile NotificationTransport transport; + /** + * All-args constructor. + */ public DefaultNotificationManager(KaaClientState state, ExecutorContext executorContext, NotificationTransport transport) { this.state = state; diff --git a/client/client-multi/client-java-desktop/src/main/java/org/kaaproject/kaa/client/DesktopKaaPlatformContext.java b/client/client-multi/client-java-desktop/src/main/java/org/kaaproject/kaa/client/DesktopKaaPlatformContext.java index 420bac3c01..4c97fa8598 100644 --- a/client/client-multi/client-java-desktop/src/main/java/org/kaaproject/kaa/client/DesktopKaaPlatformContext.java +++ b/client/client-multi/client-java-desktop/src/main/java/org/kaaproject/kaa/client/DesktopKaaPlatformContext.java @@ -43,6 +43,9 @@ public DesktopKaaPlatformContext(KaaClientProperties properties) { this(properties, new SimpleExecutorContext()); } + /** + * All-args constructor. + */ public DesktopKaaPlatformContext( KaaClientProperties properties, ExecutorContext executorContext) { super(); diff --git a/client/client-multi/client-java-desktop/src/main/java/org/kaaproject/kaa/client/transport/DesktopHttpClient.java b/client/client-multi/client-java-desktop/src/main/java/org/kaaproject/kaa/client/transport/DesktopHttpClient.java index 4bc274e7d0..6546b075da 100644 --- a/client/client-multi/client-java-desktop/src/main/java/org/kaaproject/kaa/client/transport/DesktopHttpClient.java +++ b/client/client-multi/client-java-desktop/src/main/java/org/kaaproject/kaa/client/transport/DesktopHttpClient.java @@ -48,6 +48,9 @@ public class DesktopHttpClient extends AbstractHttpClient { private CloseableHttpClient httpClient; private volatile HttpPost method; + /** + * All-args constructor. + */ public DesktopHttpClient(String url, PrivateKey privateKey, PublicKey publicKey, PublicKey remotePublicKey) { super(url, privateKey, publicKey, remotePublicKey); diff --git a/common/core/src/main/java/org/kaaproject/kaa/server/common/core/algorithms/AvroUtils.java b/common/core/src/main/java/org/kaaproject/kaa/server/common/core/algorithms/AvroUtils.java index 1a62f32a6c..1a1726ea2d 100644 --- a/common/core/src/main/java/org/kaaproject/kaa/server/common/core/algorithms/AvroUtils.java +++ b/common/core/src/main/java/org/kaaproject/kaa/server/common/core/algorithms/AvroUtils.java @@ -60,12 +60,19 @@ public static GenericData.Fixed generateUuidObject() { return new GenericData.Fixed(avroSchema, generateUuidBytes()); } - public static Schema getSchemaByType(Schema schema, Schema.Type type) { - if (schema.getType().equals(type)) { - return schema; + /** + * Returns schema from container (union or schema itself) by its type. + * + * @param container schema container + * @param type schema type + * @return schema with a specified type + */ + public static Schema getSchemaByType(Schema container, Schema.Type type) { + if (container.getType().equals(type)) { + return container; } - if (schema.getType().equals(Type.UNION)) { - List types = schema.getTypes(); + if (container.getType().equals(Type.UNION)) { + List types = container.getTypes(); if (types != null) { for (Schema typeIter : types) { if (typeIter.getType().equals(type)) { @@ -77,6 +84,12 @@ public static Schema getSchemaByType(Schema schema, Schema.Type type) { return null; } + /** + * Returns whether schema is complex. + * + * @param schema schema + * @return true if schema is complex otherwise false + */ public static boolean isComplexSchema(Schema schema) { switch (schema.getType()) { case RECORD: @@ -90,6 +103,12 @@ public static boolean isComplexSchema(Schema schema) { } } + /** + * Copies json properties. + * + * @param src source + * @param dst destination + */ public static void copyJsonProperties(JsonProperties src, JsonProperties dst) { for (Map.Entry prop : src.getJsonProps().entrySet()) { dst.addProp(prop.getKey(), prop.getValue()); @@ -142,6 +161,11 @@ private static JsonNode injectUuidsFromJsonNodes(JsonNode json, Schema schema) { return json; } + /** + * Removes UUIDs from a json tree. + * + * @param json json tree node + */ public static void removeUuids(JsonNode json) { boolean containerWithId = json.isContainerNode() && json.has(UUID_FIELD); boolean isArray = json.isArray(); diff --git a/common/core/src/main/java/org/kaaproject/kaa/server/common/core/algorithms/delta/DefaultDeltaCalculationAlgorithm.java b/common/core/src/main/java/org/kaaproject/kaa/server/common/core/algorithms/delta/DefaultDeltaCalculationAlgorithm.java index 2f58900e59..efa5c34ee3 100644 --- a/common/core/src/main/java/org/kaaproject/kaa/server/common/core/algorithms/delta/DefaultDeltaCalculationAlgorithm.java +++ b/common/core/src/main/java/org/kaaproject/kaa/server/common/core/algorithms/delta/DefaultDeltaCalculationAlgorithm.java @@ -680,6 +680,16 @@ private void processDifferences(GenericRecord oldRoot, GenericRecord newRoot) } } + + /** + * Calculates a delta. + * + * @param endpointConfiguration old configuration data (binary) + * @param newConfigurationBody the new configuration body (binary) + * @return delta + * @throws IOException the io exception + * @throws DeltaCalculatorException the delta calculation exception + */ @Override public RawBinaryDelta calculate(BaseData endpointConfiguration, BaseData newConfigurationBody) throws IOException, DeltaCalculatorException { @@ -688,6 +698,15 @@ public RawBinaryDelta calculate(BaseData endpointConfiguration, BaseData newConf return calculate(oldRoot, newRoot); } + + /** + * Calculates a delta. + * + * @param newConfigurationBody the new configuration body (binary) + * @return delta + * @throws IOException the io exception + * @throws DeltaCalculatorException the delta calculation exception + */ @Override public RawBinaryDelta calculate(BaseData newConfigurationBody) throws IOException, DeltaCalculatorException { @@ -695,6 +714,14 @@ public RawBinaryDelta calculate(BaseData newConfigurationBody) return calculate(newRoot); } + /** + * Calculates a delta. + * + * @param oldConfig old config + * @param newConfig new config + * @return delta + * @throws DeltaCalculatorException the delta calculation exception + */ public RawBinaryDelta calculate(GenericRecord oldConfig, GenericRecord newConfig) throws DeltaCalculatorException { resultDelta = new AvroBinaryDelta(deltaSchema); @@ -703,6 +730,13 @@ public RawBinaryDelta calculate(GenericRecord oldConfig, GenericRecord newConfig return resultDelta; } + /** + * Calculates a delta. + * + * @param newConfig new config + * @return delta + * @throws DeltaCalculatorException the delta calculation exception + */ public RawBinaryDelta calculate(GenericRecord newConfig) throws DeltaCalculatorException { resultDelta = new AvroBinaryDelta(deltaSchema); Schema deltaSubSchema = getDeltaSchemaByFullName(getFullName(newConfig)); diff --git a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/messages/Connect.java b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/messages/Connect.java index 96f44fca50..676dad33cd 100644 --- a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/messages/Connect.java +++ b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/messages/Connect.java @@ -64,17 +64,17 @@ public class Connect extends MqttFrame { private int nextProtocolId; /** - * AES session key + * AES session key. */ private byte[] aesSessionKey; /** - * Signature of aesSessionKey and endpointPublicKeyHash + * Signature of aesSessionKey and endpointPublicKeyHash. */ private byte[] signature; /** - * SyncRequest in Connect message + * SyncRequest in Connect message. */ private byte[] syncRequest; @@ -83,7 +83,7 @@ public class Connect extends MqttFrame { private boolean hasAesSessionKey = false; /** - * Default Constructor + * Default Constructor. * * @param keepAlive the keep alive in seconds, max value 65535 seconds. * @param nextProtocolId the next protocol id @@ -119,7 +119,7 @@ public Connect(int keepAlive, int nextProtocolId, byte[] aesSessionKey, byte[] s /** - * + * Establish connection. */ public Connect() { super(); @@ -145,9 +145,8 @@ protected void pack() { } /** - * Pack Connect variable header + * Pack Connect variable header. * - * @param pos - start position in buffer * @return - number of packed bytes. */ private void packVeriableHeader() { @@ -203,7 +202,7 @@ public void setNextProtocolId(int nextProtocolId) { } /** - * AES Session Key getter + * AES Session Key getter. * * @return byte[] aesSessionKey */ @@ -246,6 +245,8 @@ public void setSignature(byte[] signature) { /** + * Returns a sync request. + * * @return the syncRequest */ public byte[] getSyncRequest() { @@ -254,6 +255,8 @@ public byte[] getSyncRequest() { /** + * Sets a sync request. + * * @param syncRequest the syncRequest to set */ public void setSyncRequest(byte[] syncRequest) { @@ -281,9 +284,6 @@ protected void decode() throws KaaTcpProtocolException { } - /** - * - */ private void decodeSyncRequest() { int syncRequestSize = buffer.capacity() - buffer.position(); if (syncRequestSize > 0) { @@ -293,18 +293,12 @@ private void decodeSyncRequest() { } - /** - * - */ private void decodeSignature() { signature = new byte[CONNECT_SIGNATURE_LENGTH]; buffer.get(signature); } - /** - * - */ private void decodeSessionKey() { aesSessionKey = new byte[CONNECT_AES_SESSION_KEY_LENGTH]; buffer.get(aesSessionKey); diff --git a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/endpoint/security/KeyUtil.java b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/endpoint/security/KeyUtil.java index c942ea2bb6..6c76a02493 100644 --- a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/endpoint/security/KeyUtil.java +++ b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/endpoint/security/KeyUtil.java @@ -158,6 +158,12 @@ public static KeyPair generateKeyPair( return null; } + /** + * Generates a key pair. + * + * @return key pair + * @throws NoSuchAlgorithmException no such algorithm + */ public static KeyPair generateKeyPair() throws NoSuchAlgorithmException { KeyPairGenerator clientKeyGen = KeyPairGenerator.getInstance(RSA); clientKeyGen.initialize(2048); diff --git a/pom.xml b/pom.xml index 2a3df92d44..c81037124e 100644 --- a/pom.xml +++ b/pom.xml @@ -97,7 +97,8 @@ Copyright 2014-2016 CyberVision, Inc. 2.5.2 2.17 7.0 - **/gen/**, **/target/**, **/org/kaaproject/kaa/schema/** + **/gen/**, **/target/**, **/org/kaaproject/kaa/schema/**, + **/org/kaaproject/kaa/common/dto/ctl/** 0.10 3.18.1-GA 1.2.1.2 diff --git a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/CTLService.java b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/CtlService.java similarity index 99% rename from server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/CTLService.java rename to server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/CtlService.java index 3e40f39988..39dd24d4a5 100644 --- a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/CTLService.java +++ b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/CtlService.java @@ -26,7 +26,7 @@ /** * Common type library service. */ -public interface CTLService { +public interface CtlService { public static final String DEFAULT_SYSTEM_EMPTY_SCHEMA_FQN = "org.kaaproject.kaa.schema.system.EmptyData"; diff --git a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/impl/CTLSchemaMetaInfoDao.java b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/impl/CtlSchemaMetaInfoDao.java similarity index 98% rename from server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/impl/CTLSchemaMetaInfoDao.java rename to server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/impl/CtlSchemaMetaInfoDao.java index 56b7a0303d..6ed1aba4a5 100644 --- a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/impl/CTLSchemaMetaInfoDao.java +++ b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/impl/CtlSchemaMetaInfoDao.java @@ -23,7 +23,7 @@ * * @param the model type parameter. */ -public interface CTLSchemaMetaInfoDao extends SqlDao { +public interface CtlSchemaMetaInfoDao extends SqlDao { /** * Find a CTL schema meta info of the given fully qualified name, tenant and application diff --git a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/impl/sql/HibernateAbstractDao.java b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/impl/sql/HibernateAbstractDao.java index 58aae9f45d..c2f42e887c 100644 --- a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/impl/sql/HibernateAbstractDao.java +++ b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/impl/sql/HibernateAbstractDao.java @@ -203,6 +203,12 @@ public V save(V object, Class clazz) { } + /** + * Updates an entity. + * + * @param obj entity + * @return updated entity. + */ public T update(T obj) { LOG.trace("Updated {} entity: {} ", getSimpleClassName(), obj); getSession().update(obj); diff --git a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/impl/sql/HibernateCtlSchemaDao.java b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/impl/sql/HibernateCtlSchemaDao.java index 5340335f20..f913baa09b 100644 --- a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/impl/sql/HibernateCtlSchemaDao.java +++ b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/impl/sql/HibernateCtlSchemaDao.java @@ -35,7 +35,7 @@ import org.hibernate.criterion.Restrictions; import org.hibernate.sql.JoinType; import org.kaaproject.kaa.server.common.dao.impl.CtlSchemaDao; -import org.kaaproject.kaa.server.common.dao.model.sql.CTLSchema; +import org.kaaproject.kaa.server.common.dao.model.sql.CtlSchema; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Repository; @@ -46,14 +46,14 @@ import java.util.List; @Repository -public class HibernateCtlSchemaDao extends HibernateAbstractDao - implements CtlSchemaDao { +public class HibernateCtlSchemaDao extends HibernateAbstractDao + implements CtlSchemaDao { private static final Logger LOG = LoggerFactory.getLogger(HibernateCtlSchemaDao.class); @Override - protected Class getEntityClass() { - return CTLSchema.class; + protected Class getEntityClass() { + return CtlSchema.class; } private Criterion buildScopeCriterion(String tenantId, String applicationId) { @@ -85,20 +85,20 @@ private Criterion buildScopeCriterion(String tenantId, String applicationId) { @Override @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class) - public CTLSchema save(CTLSchema object) { + public CtlSchema save(CtlSchema object) { return super.save(object); } @Override @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class) - public CTLSchema save(CTLSchema object, boolean flush) { + public CtlSchema save(CtlSchema object, boolean flush) { return super.save(object, flush); } @Override - public List findSystemSchemas() { + public List findSystemSchemas() { LOG.debug("Searching system ctl metadata"); - List schemas = findListByCriterionWithAlias( + List schemas = findListByCriterionWithAlias( CTL_SCHEMA_META_INFO_PROPERTY, CTL_SCHEMA_META_INFO_ALIAS, buildScopeCriterion(null, null)); if (LOG.isTraceEnabled()) { @@ -110,9 +110,9 @@ public List findSystemSchemas() { } @Override - public List findAvailableSchemasForTenant(String tenantId) { + public List findAvailableSchemasForTenant(String tenantId) { LOG.debug("Searching available ctl schemas for tenant with id [{}]", tenantId); - List availableSchemas = findListByCriterionWithAlias( + List availableSchemas = findListByCriterionWithAlias( CTL_SCHEMA_META_INFO_PROPERTY, CTL_SCHEMA_META_INFO_ALIAS, buildScopeCriterion(tenantId, null)); if (LOG.isTraceEnabled()) { @@ -124,11 +124,11 @@ public List findAvailableSchemasForTenant(String tenantId) { } @Override - public List findAvailableSchemasForApplication(String tenantId, String appId) { + public List findAvailableSchemasForApplication(String tenantId, String appId) { LOG.debug("Searching available ctl schemas for application by tenant id [{}] " + "and application id [{}]", tenantId, appId); - List availableSchemas = findListByCriterionWithAlias( + List availableSchemas = findListByCriterionWithAlias( CTL_SCHEMA_META_INFO_PROPERTY, CTL_SCHEMA_META_INFO_ALIAS, buildScopeCriterion(tenantId, appId)); @@ -142,9 +142,9 @@ public List findAvailableSchemasForApplication(String tenantId, Strin } @Override - public CTLSchema findByFqnAndVerAndTenantIdAndApplicationId( + public CtlSchema findByFqnAndVerAndTenantIdAndApplicationId( String fqn, Integer version, String tenantId, String applicationId) { - CTLSchema ctlSchema = null; + CtlSchema ctlSchema = null; LOG.debug("Searching ctl schema by fqn [{}], version [{}], tenant [{}] and applicationId [{}]", fqn, version, tenantId, applicationId); if (isNotBlank(fqn) && version != null) { @@ -177,8 +177,8 @@ public CTLSchema findByFqnAndVerAndTenantIdAndApplicationId( } @Override - public CTLSchema findByMetaInfoIdAndVer(String metaInfoId, Integer version) { - CTLSchema ctlSchema = null; + public CtlSchema findByMetaInfoIdAndVer(String metaInfoId, Integer version) { + CtlSchema ctlSchema = null; LOG.debug("Searching ctl schema by meta info id [{}] and version [{}]", metaInfoId, version); if (isNotBlank(metaInfoId) && version != null) { @@ -199,11 +199,11 @@ public CTLSchema findByMetaInfoIdAndVer(String metaInfoId, Integer version) { } @Override - public CTLSchema findAnyByFqnAndVerAndTenantIdAndApplicationId(String fqn, + public CtlSchema findAnyByFqnAndVerAndTenantIdAndApplicationId(String fqn, Integer version, String tenantId, String applicationId) { - CTLSchema ctlSchema = null; + CtlSchema ctlSchema = null; LOG.debug("Searching any ctl schema by fqn [{}], version [{}], " + "tenant [{}] and applicationId [{}]", fqn, version, tenantId, applicationId); @@ -226,7 +226,7 @@ public CTLSchema findAnyByFqnAndVerAndTenantIdAndApplicationId(String fqn, } @Override - public CTLSchema findLatestByFqnAndTenantIdAndApplicationId(String fqn, + public CtlSchema findLatestByFqnAndTenantIdAndApplicationId(String fqn, String tenantId, String applicationId) { LOG.debug("Searching latest ctl schema by fqn [{}], tenantId [{}] and applicationId [{}]", @@ -248,7 +248,7 @@ public CTLSchema findLatestByFqnAndTenantIdAndApplicationId(String fqn, : Restrictions.isNull(CTL_SCHEMA_META_INFO_ALIAS_APPLICATION_ID)) ).addOrder(Order.desc(CTL_SCHEMA_VERSION)) .setMaxResults(FIRST); - CTLSchema latestSchema = findOneByCriteria(criteria); + CtlSchema latestSchema = findOneByCriteria(criteria); if (LOG.isTraceEnabled()) { LOG.trace("[{},{},{}] Search result: [{}].", fqn, tenantId, applicationId, latestSchema); @@ -260,8 +260,8 @@ public CTLSchema findLatestByFqnAndTenantIdAndApplicationId(String fqn, } @Override - public CTLSchema findLatestByMetaInfoId(String metaInfoId) { - CTLSchema latestSchema = null; + public CtlSchema findLatestByMetaInfoId(String metaInfoId) { + CtlSchema latestSchema = null; LOG.debug("Searching latest version of ctl schema by meta info id [{}]", metaInfoId); if (isNotBlank(metaInfoId)) { @@ -281,7 +281,7 @@ public CTLSchema findLatestByMetaInfoId(String metaInfoId) { } @Override - public List findAllByFqnAndTenantIdAndApplicationId(String fqn, + public List findAllByFqnAndTenantIdAndApplicationId(String fqn, String tenantId, String applicationId) { LOG.debug("Searching available version of ctl schema by fqn [{}], " @@ -304,7 +304,7 @@ public List findAllByFqnAndTenantIdAndApplicationId(String fqn, : Restrictions.isNull(CTL_SCHEMA_META_INFO_ALIAS_APPLICATION_ID)) ).addOrder(Order.asc(CTL_SCHEMA_VERSION)); - List schemas = findListByCriteria(criteria); + List schemas = findListByCriteria(criteria); if (LOG.isTraceEnabled()) { LOG.trace("Search result: [{}].", Arrays.toString(schemas.toArray())); } else { @@ -314,13 +314,13 @@ public List findAllByFqnAndTenantIdAndApplicationId(String fqn, } @Override - public List findAllByMetaInfoId(String metaInfoId) { + public List findAllByMetaInfoId(String metaInfoId) { LOG.debug("Searching available version of ctl schema by meta info id [{}]", metaInfoId); Criteria criteria = getCriteria() .createAlias(CTL_SCHEMA_META_INFO_PROPERTY, CTL_SCHEMA_META_INFO_ALIAS) .add(Restrictions.eq(CTL_SCHEMA_META_INFO_ALIAS_ID, Long.valueOf(metaInfoId))) .addOrder(Order.asc(CTL_SCHEMA_VERSION)); - List schemas = findListByCriteria(criteria); + List schemas = findListByCriteria(criteria); if (LOG.isTraceEnabled()) { LOG.trace("Search result: [{}].", Arrays.toString(schemas.toArray())); } else { @@ -330,9 +330,9 @@ public List findAllByMetaInfoId(String metaInfoId) { } @Override - public List findDependentSchemas(String schemaId) { + public List findDependentSchemas(String schemaId) { LOG.debug("Searching dependents ctl schemas for schema with id [{}]", schemaId); - List dependentsList = findListByCriterionWithAlias( + List dependentsList = findListByCriterionWithAlias( CTL_SCHEMA_DEPENDENCY_PROP, CTL_SCHEMA_DEPENDENCY_ALIAS, JoinType.INNER_JOIN, diff --git a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/impl/sql/HibernateCtlSchemaMetaInfoDao.java b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/impl/sql/HibernateCtlSchemaMetaInfoDao.java index bbe80d392f..f9bf15c9aa 100644 --- a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/impl/sql/HibernateCtlSchemaMetaInfoDao.java +++ b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/impl/sql/HibernateCtlSchemaMetaInfoDao.java @@ -24,7 +24,7 @@ import org.hibernate.criterion.Criterion; import org.hibernate.criterion.Restrictions; -import org.kaaproject.kaa.server.common.dao.impl.CTLSchemaMetaInfoDao; +import org.kaaproject.kaa.server.common.dao.impl.CtlSchemaMetaInfoDao; import org.kaaproject.kaa.server.common.dao.model.sql.CTLSchemaMetaInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,7 +39,7 @@ @Repository public class HibernateCtlSchemaMetaInfoDao extends HibernateAbstractDao - implements CTLSchemaMetaInfoDao { + implements CtlSchemaMetaInfoDao { private static final Logger LOG = LoggerFactory.getLogger(HibernateCtlSchemaMetaInfoDao.class); diff --git a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/ApplicationEventMap.java b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/ApplicationEventMap.java index 94b0c1bbf6..7a1b6a473e 100644 --- a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/ApplicationEventMap.java +++ b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/ApplicationEventMap.java @@ -60,6 +60,9 @@ public ApplicationEventMap(Long id) { this.id = id; } + /** + * Instantiates the ApplicationEventMap. + */ public ApplicationEventMap(ApplicationEventMapDto dto) { this.id = getLongId(dto.getId()); Long eventClassId = getLongId(dto.getEventClassId()); diff --git a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/BaseSchema.java b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/BaseSchema.java index b1f381592a..59aa1d4451 100644 --- a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/BaseSchema.java +++ b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/BaseSchema.java @@ -75,7 +75,7 @@ public abstract class BaseSchema extends GenericModel implements Serializable { +public class ConfigurationSchema + extends BaseSchema + implements Serializable { private static final long serialVersionUID = -8854035430683210037L; @@ -120,7 +122,8 @@ protected GenericModel newInstance(Long id) { @Override public String toString() { return "ConfigurationSchema [version=" + version + ", name=" + name + ", description=" - + description + ", createdUsername=" + createdUsername + ", createdTime=" + createdTime + ", id=" + id + + description + ", createdUsername=" + createdUsername + ", createdTime=" + + createdTime + ", id=" + id + "]"; } diff --git a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/CTLSchema.java b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/CtlSchema.java similarity index 89% rename from server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/CTLSchema.java rename to server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/CtlSchema.java index 09d0c36653..ca1a266875 100644 --- a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/CTLSchema.java +++ b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/CtlSchema.java @@ -52,14 +52,17 @@ import javax.persistence.UniqueConstraint; @Entity -@Table(name = CTL_SCHEMA_TABLE_NAME, uniqueConstraints = -@UniqueConstraint(columnNames = {CTL_SCHEMA_META_INFO_ID, CTL_SCHEMA_VERSION}, name = CTL_SCHEMA_UNIQUE_CONSTRAINT)) -public class CTLSchema extends GenericModel implements Serializable { +@Table(name = CTL_SCHEMA_TABLE_NAME, + uniqueConstraints = + @UniqueConstraint(columnNames = {CTL_SCHEMA_META_INFO_ID, CTL_SCHEMA_VERSION}, + name = CTL_SCHEMA_UNIQUE_CONSTRAINT)) +public class CtlSchema extends GenericModel implements Serializable { private static final long serialVersionUID = -1179381742235545494L; @ManyToOne(optional = true, fetch = FetchType.EAGER) - @JoinColumn(nullable = false, name = CTL_SCHEMA_META_INFO_ID, foreignKey = @ForeignKey(name = CTL_SCHEMA_META_INFO_FK)) + @JoinColumn(nullable = false, name = CTL_SCHEMA_META_INFO_ID, + foreignKey = @ForeignKey(name = CTL_SCHEMA_META_INFO_FK)) private CTLSchemaMetaInfo metaInfo; @Column(name = CTL_SCHEMA_VERSION) private Integer version; @@ -76,18 +79,20 @@ public class CTLSchema extends GenericModel implements Serializabl @ManyToMany(fetch = FetchType.LAZY) @JoinTable(name = CTL_SCHEMA_JOIN_TABLE_NAME, - joinColumns = {@JoinColumn(name = CTL_SCHEMA_JOIN_TABLE_PARENT_ID)}, foreignKey = @ForeignKey(name = CTL_SCHEMA_JOIN_TABLE_PARENT_FK), - inverseJoinColumns = {@JoinColumn(name = CTL_SCHEMA_JOIN_TABLE_CHILD_ID)}, inverseForeignKey = @ForeignKey(name = CTL_SCHEMA_JOIN_TABLE_CHILD_FK)) - private Set dependencySet = new HashSet<>(); + joinColumns = {@JoinColumn(name = CTL_SCHEMA_JOIN_TABLE_PARENT_ID)}, + foreignKey = @ForeignKey(name = CTL_SCHEMA_JOIN_TABLE_PARENT_FK), + inverseJoinColumns = {@JoinColumn(name = CTL_SCHEMA_JOIN_TABLE_CHILD_ID)}, + inverseForeignKey = @ForeignKey(name = CTL_SCHEMA_JOIN_TABLE_CHILD_FK)) + private Set dependencySet = new HashSet<>(); - public CTLSchema() { + public CtlSchema() { } - public CTLSchema(Long id) { + public CtlSchema(Long id) { this.id = id; } - public CTLSchema(CTLSchemaDto dto) { + public CtlSchema(CTLSchemaDto dto) { this.id = getLongId(dto.getId()); this.metaInfo = new CTLSchemaMetaInfo(dto.getMetaInfo()); this.version = dto.getVersion(); @@ -102,7 +107,7 @@ public void update(CTLSchemaDto dto) { Set dependencies = dto.getDependencySet(); if (dependencies != null && !dependencies.isEmpty()) { for (CTLSchemaDto dependency : dependencies) { - dependencySet.add(new CTLSchema(dependency)); + dependencySet.add(new CtlSchema(dependency)); } } } @@ -139,11 +144,11 @@ public void setDefaultRecord(String defaultRecord) { this.defaultRecord = defaultRecord; } - public Set getDependencySet() { + public Set getDependencySet() { return dependencySet; } - public void setDependencySet(Set dependencySet) { + public void setDependencySet(Set dependencySet) { this.dependencySet = dependencySet; } @@ -170,7 +175,7 @@ protected CTLSchemaDto createDto() { @Override protected GenericModel newInstance(Long id) { - return new CTLSchema(id); + return new CtlSchema(id); } @Override @@ -212,7 +217,7 @@ public boolean equals(Object obj) { if (getClass() != obj.getClass()) { return false; } - CTLSchema other = (CTLSchema) obj; + CtlSchema other = (CtlSchema) obj; if (body == null) { if (other.body != null) { return false; @@ -264,7 +269,7 @@ public boolean equals(Object obj) { @Override public String toString() { StringBuilder builder = new StringBuilder(); - builder.append("CTLSchema [metaInfo="); + builder.append("CtlSchema [metaInfo="); builder.append(metaInfo); builder.append(", version="); builder.append(version); diff --git a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/EventClass.java b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/EventClass.java index 5e4a2f992a..01002b2d79 100644 --- a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/EventClass.java +++ b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/EventClass.java @@ -86,7 +86,7 @@ public EventClass(EventClassDto dto) { this.createdTime = dto.getCreatedTime(); Long ctlId = getLongId(dto.getCtlSchemaId()); if (ctlId != null) { - this.setCtlSchema(new CTLSchema(ctlId)); + this.setCtlSchema(new CtlSchema(ctlId)); } } diff --git a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/EventClassFamilyVersion.java b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/EventClassFamilyVersion.java index 2c4d37ed20..8b2a517055 100644 --- a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/EventClassFamilyVersion.java +++ b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/EventClassFamilyVersion.java @@ -51,6 +51,9 @@ public class EventClassFamilyVersion extends GenericModel(headerStructure) : new ArrayList()); + dto.setHeaderStructure(headerStructure != null + ? new ArrayList<>(headerStructure) + : new ArrayList<>()); return dto; } diff --git a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/LogSchema.java b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/LogSchema.java index 76bbdbcac0..1414202c82 100644 --- a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/LogSchema.java +++ b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/LogSchema.java @@ -29,6 +29,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.kaaproject.kaa.server.common.dao.model.sql; import static org.kaaproject.kaa.server.common.dao.DaoConstants.LOG_SCHEMA_TABLE_NAME; diff --git a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/NotificationSchema.java b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/NotificationSchema.java index 10d6a9a624..33508bea42 100644 --- a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/NotificationSchema.java +++ b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/NotificationSchema.java @@ -44,6 +44,9 @@ public NotificationSchema(Long id) { this.id = id; } + /** + * Instantiates the NotificationSchema. + */ public NotificationSchema(NotificationSchemaDto dto) { super(dto); if (dto != null) { @@ -77,18 +80,18 @@ public void setType(NotificationTypeDto type) { } @Override - public boolean equals(Object o) { - if (this == o) { + public boolean equals(Object obj) { + if (this == obj) { return true; } - if (o == null || getClass() != o.getClass()) { + if (obj == null || getClass() != obj.getClass()) { return false; } - if (!super.equals(o)) { + if (!super.equals(obj)) { return false; } - NotificationSchema that = (NotificationSchema) o; + NotificationSchema that = (NotificationSchema) obj; if (type != that.type) { return false; diff --git a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/Topic.java b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/Topic.java index 564320d2f1..4d6e28f16d 100644 --- a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/Topic.java +++ b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/Topic.java @@ -93,6 +93,9 @@ public Topic(Long id) { this.id = id; } + /** + * Instantiates new topic. + */ public Topic(TopicDto dto) { if (dto != null) { this.id = getLongId(dto); diff --git a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/User.java b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/User.java index 43ca46398d..f4bf1c28a0 100644 --- a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/User.java +++ b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/User.java @@ -68,6 +68,9 @@ public User(Long id) { this.id = id; } + /** + * Instantiates new user. + */ public User(UserDto dto) { if (dto != null) { this.id = getLongId(dto); diff --git a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/service/ApplicationServiceImpl.java b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/service/ApplicationServiceImpl.java index cc1e679e8d..f59acec3f9 100644 --- a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/service/ApplicationServiceImpl.java +++ b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/service/ApplicationServiceImpl.java @@ -37,7 +37,7 @@ import org.kaaproject.kaa.common.dto.ctl.CTLSchemaDto; import org.kaaproject.kaa.common.dto.logs.LogSchemaDto; import org.kaaproject.kaa.server.common.dao.ApplicationService; -import org.kaaproject.kaa.server.common.dao.CTLService; +import org.kaaproject.kaa.server.common.dao.CtlService; import org.kaaproject.kaa.server.common.dao.ConfigurationService; import org.kaaproject.kaa.server.common.dao.EndpointService; import org.kaaproject.kaa.server.common.dao.LogSchemaService; @@ -84,7 +84,7 @@ public class ApplicationServiceImpl implements ApplicationService { private EndpointService endpointService; @Autowired - private CTLService ctlService; + private CtlService ctlService; @Autowired private ConfigurationService configurationService; diff --git a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/service/ConfigurationServiceImpl.java b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/service/ConfigurationServiceImpl.java index c99972f465..f0d1688e5c 100644 --- a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/service/ConfigurationServiceImpl.java +++ b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/service/ConfigurationServiceImpl.java @@ -58,7 +58,7 @@ import org.kaaproject.kaa.server.common.core.schema.DataSchema; import org.kaaproject.kaa.server.common.core.schema.OverrideSchema; import org.kaaproject.kaa.server.common.core.schema.ProtocolSchema; -import org.kaaproject.kaa.server.common.dao.CTLService; +import org.kaaproject.kaa.server.common.dao.CtlService; import org.kaaproject.kaa.server.common.dao.ConfigurationService; import org.kaaproject.kaa.server.common.dao.HistoryService; import org.kaaproject.kaa.server.common.dao.exception.DatabaseProcessingException; @@ -104,7 +104,7 @@ public class ConfigurationServiceImpl implements ConfigurationService { @Autowired - private CTLService ctlService; + private CtlService ctlService; @Autowired private SchemaGenerationAlgorithmFactory schemaGeneratorFactory; diff --git a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/service/CtlServiceImpl.java b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/service/CtlService.java similarity index 96% rename from server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/service/CtlServiceImpl.java rename to server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/service/CtlService.java index ba8e291364..09542690cc 100644 --- a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/service/CtlServiceImpl.java +++ b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/service/CtlService.java @@ -45,13 +45,12 @@ import org.kaaproject.kaa.server.common.core.configuration.RawData; import org.kaaproject.kaa.server.common.core.configuration.RawDataFactory; import org.kaaproject.kaa.server.common.core.schema.RawSchema; -import org.kaaproject.kaa.server.common.dao.CTLService; import org.kaaproject.kaa.server.common.dao.exception.DatabaseProcessingException; import org.kaaproject.kaa.server.common.dao.exception.IncorrectParameterException; -import org.kaaproject.kaa.server.common.dao.impl.CTLSchemaMetaInfoDao; +import org.kaaproject.kaa.server.common.dao.impl.CtlSchemaMetaInfoDao; import org.kaaproject.kaa.server.common.dao.impl.CtlSchemaDao; import org.kaaproject.kaa.server.common.dao.impl.DaoUtil; -import org.kaaproject.kaa.server.common.dao.model.sql.CTLSchema; +import org.kaaproject.kaa.server.common.dao.model.sql.CtlSchema; import org.kaaproject.kaa.server.common.dao.model.sql.CTLSchemaMetaInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -74,13 +73,13 @@ @Service @Transactional -public class CtlServiceImpl implements CTLService { +public class CtlService implements CtlService { private static final String JSON = "application/json"; private static final String ZIP = "application/zip"; private static final String VERSION = "version"; private static final String FQN = "fqn"; - private static final Logger LOG = LoggerFactory.getLogger(CtlServiceImpl.class); + private static final Logger LOG = LoggerFactory.getLogger(CtlService.class); private static final String DEPENDENCIES = "dependencies"; private static final String DEFAULT_SYSTEM_EMPTY_SCHEMA_FILE = "/default_system_empty_schema" + ".avsc"; @@ -103,10 +102,10 @@ public class CtlServiceImpl implements CTLService { private static final ObjectMapper FORMATTER = new ObjectMapper(); private final LockOptions lockOptions = new LockOptions(LockMode.PESSIMISTIC_WRITE); @Autowired - private CtlSchemaDao ctlSchemaDao; + private CtlSchemaDao ctlSchemaDao; @Autowired - private CTLSchemaMetaInfoDao ctlSchemaMetaInfoDao; + private CtlSchemaMetaInfoDao ctlSchemaMetaInfoDao; @Override public CTLSchemaDto getOrCreateEmptySystemSchema(String createdUsername) { @@ -119,7 +118,7 @@ public CTLSchemaDto getOrCreateEmptySystemSchema(String createdUsername) { ctlSchema.setVersion(DEFAULT_SYSTEM_EMPTY_SCHEMA_VERSION); ctlSchema.setCreatedUsername(createdUsername); ctlSchema.setDependencySet(new HashSet()); - String body = getStringFromFile(DEFAULT_SYSTEM_EMPTY_SCHEMA_FILE, CtlServiceImpl.class); + String body = getStringFromFile(DEFAULT_SYSTEM_EMPTY_SCHEMA_FILE, CtlService.class); if (!body.isEmpty()) { ctlSchema.setBody(body); } else { @@ -151,7 +150,7 @@ public CTLSchemaDto saveCtlSchema(CTLSchemaDto unSavedSchema) { CTLSchemaMetaInfo uniqueMetaInfo = ctlSchemaMetaInfoDao.save( new CTLSchemaMetaInfo(metaInfo)); ctlSchemaMetaInfoDao.lockRequest(lockOptions).setScope(true).lock(uniqueMetaInfo); - CTLSchema ctlSchema = new CTLSchema(unSavedSchema); + CtlSchema ctlSchema = new CtlSchema(unSavedSchema); ctlSchema.setMetaInfo(uniqueMetaInfo); ctlSchema.setCreatedTime(System.currentTimeMillis()); ctlSchemaMetaInfoDao.refresh(uniqueMetaInfo); @@ -210,7 +209,7 @@ private CTLSchemaDto generateDefaultRecord(CTLSchemaDto unSavedSchema) { public CTLSchemaDto updateCtlSchema(CTLSchemaDto ctlSchema) { validateCtlSchemaObject(ctlSchema); LOG.debug("Update ctl schema with id [{}]", ctlSchema.getId()); - CTLSchema schema = ctlSchemaDao.findById(ctlSchema.getId()); + CtlSchema schema = ctlSchemaDao.findById(ctlSchema.getId()); if (schema != null) { synchronized (this) { if (ctlSchema.getVersion() @@ -316,18 +315,18 @@ public void removeCtlSchemaByFqnAndVerAndTenantIdAndApplicationId(String fqn, In } LOG.debug("Remove ctl schema by fqn {} version {}, tenant id {} and application id {}", fqn, version, tenantId, applicationId); - CTLSchema ctlSchema = ctlSchemaDao.findByFqnAndVerAndTenantIdAndApplicationId(fqn, version, + CtlSchema ctlSchema = ctlSchemaDao.findByFqnAndVerAndTenantIdAndApplicationId(fqn, version, tenantId, applicationId); if (ctlSchema != null) { - List dependsList = ctlSchemaDao.findDependentSchemas(ctlSchema.getStringId()); + List dependsList = ctlSchemaDao.findDependentSchemas(ctlSchema.getStringId()); if (dependsList.isEmpty()) { synchronized (this) { CTLSchemaMetaInfo metaInfo = ctlSchema.getMetaInfo(); ctlSchemaMetaInfoDao.lockRequest(lockOptions).setScope(true).lock(metaInfo); try { ctlSchemaDao.removeById(ctlSchema.getStringId()); - List schemas = ctlSchemaDao.findAllByMetaInfoId(metaInfo.getStringId()); + List schemas = ctlSchemaDao.findAllByMetaInfoId(metaInfo.getStringId()); if (schemas == null || schemas.isEmpty()) { ctlSchemaMetaInfoDao.removeById(metaInfo.getStringId()); } @@ -451,7 +450,7 @@ public List findCtlSchemaDependents(String schemaId) { validateSqlId(schemaId, "Incorrect schema id for ctl schema request."); LOG.debug("Find dependents schemas for schema with id [{}]", schemaId); List list = Collections.emptyList(); - CTLSchema schemaDto = ctlSchemaDao.findById(schemaId); + CtlSchema schemaDto = ctlSchemaDao.findById(schemaId); if (schemaDto != null) { list = convertDtoList(ctlSchemaDao.findDependentSchemas(schemaDto.getStringId())); @@ -468,7 +467,7 @@ public List findCtlSchemaDependents(String fqn, Integer version, S LOG.debug("Find dependents schemas for schema with fqn {} version {}, tenantId {} and " + "applicationId ()", fqn, version, tenantId, applicationId); List schemas = Collections.emptyList(); - CTLSchema schema = ctlSchemaDao.findByFqnAndVerAndTenantIdAndApplicationId(fqn, version, + CtlSchema schema = ctlSchemaDao.findByFqnAndVerAndTenantIdAndApplicationId(fqn, version, tenantId, applicationId); if (schema != null) { @@ -490,10 +489,10 @@ private void validateCtlSchemaObject(CTLSchemaDto ctlSchema) { } } - private List getMetaInfoFromCtlSchema(List schemas) { + private List getMetaInfoFromCtlSchema(List schemas) { Map metaInfoMap = new HashMap<>(); if (!schemas.isEmpty()) { - for (CTLSchema schema : schemas) { + for (CtlSchema schema : schemas) { String metaInfoId = schema.getMetaInfo().getStringId(); CTLSchemaMetaInfoDto metaInfoDto = metaInfoMap.get(metaInfoId); if (metaInfoDto == null) { diff --git a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/service/EndpointServiceImpl.java b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/service/EndpointServiceImpl.java index e3a1a71e7c..b51e586640 100644 --- a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/service/EndpointServiceImpl.java +++ b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/service/EndpointServiceImpl.java @@ -46,7 +46,7 @@ import org.kaaproject.kaa.common.dto.UpdateNotificationDto; import org.kaaproject.kaa.common.dto.ctl.CTLSchemaDto; import org.kaaproject.kaa.common.hash.Sha1HashUtils; -import org.kaaproject.kaa.server.common.dao.CTLService; +import org.kaaproject.kaa.server.common.dao.CtlService; import org.kaaproject.kaa.server.common.dao.EndpointService; import org.kaaproject.kaa.server.common.dao.HistoryService; import org.kaaproject.kaa.server.common.dao.ServerProfileService; @@ -93,7 +93,7 @@ public class EndpointServiceImpl implements EndpointService { private ServerProfileService serverProfileService; @Autowired - private CTLService ctlService; + private CtlService ctlService; @Autowired private TopicDao topicDao; diff --git a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/service/EventClassServiceImpl.java b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/service/EventClassServiceImpl.java index 2158b299aa..fc3bfd96ba 100644 --- a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/service/EventClassServiceImpl.java +++ b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/service/EventClassServiceImpl.java @@ -34,7 +34,7 @@ import org.kaaproject.kaa.server.common.dao.impl.CtlSchemaDao; import org.kaaproject.kaa.server.common.dao.impl.EventClassDao; import org.kaaproject.kaa.server.common.dao.impl.EventClassFamilyDao; -import org.kaaproject.kaa.server.common.dao.model.sql.CTLSchema; +import org.kaaproject.kaa.server.common.dao.model.sql.CtlSchema; import org.kaaproject.kaa.server.common.dao.model.sql.EventClass; import org.kaaproject.kaa.server.common.dao.model.sql.EventClassFamily; import org.kaaproject.kaa.server.common.dao.model.sql.EventClassFamilyVersion; @@ -70,7 +70,7 @@ public class EventClassServiceImpl implements EventClassService { private EventSchemaProcessor eventSchemaProcessor; @Autowired - private CtlSchemaDao ctlSchemaDao; + private CtlSchemaDao ctlSchemaDao; @Override public List findEventClassFamiliesByTenantId( diff --git a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/service/NotificationServiceImpl.java b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/service/NotificationServiceImpl.java index 209a919966..294733bae3 100644 --- a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/service/NotificationServiceImpl.java +++ b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/service/NotificationServiceImpl.java @@ -161,6 +161,12 @@ public UpdateNotificationDto saveNotification(NotificationDto d } } + /** + * Sends a notification and increments a topic sequence number. + * + * @param dto notification + * @return saved notification + */ public NotificationDto saveNotificationAndIncTopicSecNum(NotificationDto dto) { NotificationDto notificationDto = null; Topic topic = topicDao.getNextSeqNumber(dto.getTopicId()); diff --git a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/service/SdkTokenGenerator.java b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/service/SdkTokenGenerator.java index 2fca414dc8..c9a489386c 100644 --- a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/service/SdkTokenGenerator.java +++ b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/service/SdkTokenGenerator.java @@ -31,6 +31,11 @@ public class SdkTokenGenerator { private SdkTokenGenerator() { } + /** + * Generates the SDK token. + * + * @param sdkProfileDto SDK profile + */ public static void generateSdkToken(SdkProfileDto sdkProfileDto) { if (StringUtils.isEmpty(sdkProfileDto.getToken())) { try { diff --git a/server/common/dao/src/test/java/org/kaaproject/kaa/server/common/dao/AbstractTest.java b/server/common/dao/src/test/java/org/kaaproject/kaa/server/common/dao/AbstractTest.java index f2e10b8562..beb9f90ed8 100644 --- a/server/common/dao/src/test/java/org/kaaproject/kaa/server/common/dao/AbstractTest.java +++ b/server/common/dao/src/test/java/org/kaaproject/kaa/server/common/dao/AbstractTest.java @@ -59,7 +59,7 @@ import org.kaaproject.kaa.server.common.dao.exception.DatabaseProcessingException; import org.kaaproject.kaa.server.common.dao.impl.ApplicationDao; import org.kaaproject.kaa.server.common.dao.impl.ApplicationEventFamilyMapDao; -import org.kaaproject.kaa.server.common.dao.impl.CTLSchemaMetaInfoDao; +import org.kaaproject.kaa.server.common.dao.impl.CtlSchemaMetaInfoDao; import org.kaaproject.kaa.server.common.dao.impl.ConfigurationDao; import org.kaaproject.kaa.server.common.dao.impl.ConfigurationSchemaDao; import org.kaaproject.kaa.server.common.dao.impl.CtlSchemaDao; @@ -85,7 +85,7 @@ import org.kaaproject.kaa.server.common.dao.model.Notification; import org.kaaproject.kaa.server.common.dao.model.sql.Application; import org.kaaproject.kaa.server.common.dao.model.sql.ApplicationEventFamilyMap; -import org.kaaproject.kaa.server.common.dao.model.sql.CTLSchema; +import org.kaaproject.kaa.server.common.dao.model.sql.CtlSchema; import org.kaaproject.kaa.server.common.dao.model.sql.CTLSchemaMetaInfo; import org.kaaproject.kaa.server.common.dao.model.sql.Configuration; import org.kaaproject.kaa.server.common.dao.model.sql.ConfigurationSchema; @@ -173,7 +173,7 @@ public class AbstractTest { @Autowired protected LogAppendersService logAppendersService; @Autowired - protected CTLService ctlService; + protected CtlService ctlService; @Autowired protected ServerProfileService serverProfileService; @@ -216,9 +216,9 @@ public class AbstractTest { @Autowired protected SdkProfileDao sdkProfileDao; @Autowired - protected CtlSchemaDao ctlSchemaDao; + protected CtlSchemaDao ctlSchemaDao; @Autowired - protected CTLSchemaMetaInfoDao ctlSchemaMetaInfoDao; + protected CtlSchemaMetaInfoDao ctlSchemaMetaInfoDao; @Autowired protected ServerProfileSchemaDao serverProfileSchemaDao; diff --git a/server/common/dao/src/test/java/org/kaaproject/kaa/server/common/dao/impl/sql/HibernateAbstractTest.java b/server/common/dao/src/test/java/org/kaaproject/kaa/server/common/dao/impl/sql/HibernateAbstractTest.java index cfff7808ce..25a7f8cbf0 100644 --- a/server/common/dao/src/test/java/org/kaaproject/kaa/server/common/dao/impl/sql/HibernateAbstractTest.java +++ b/server/common/dao/src/test/java/org/kaaproject/kaa/server/common/dao/impl/sql/HibernateAbstractTest.java @@ -28,7 +28,7 @@ import org.kaaproject.kaa.server.common.dao.model.sql.Application; import org.kaaproject.kaa.server.common.dao.model.sql.ApplicationEventFamilyMap; import org.kaaproject.kaa.server.common.dao.model.sql.ApplicationEventMap; -import org.kaaproject.kaa.server.common.dao.model.sql.CTLSchema; +import org.kaaproject.kaa.server.common.dao.model.sql.CtlSchema; import org.kaaproject.kaa.server.common.dao.model.sql.CTLSchemaMetaInfo; import org.kaaproject.kaa.server.common.dao.model.sql.Change; import org.kaaproject.kaa.server.common.dao.model.sql.Configuration; @@ -160,7 +160,7 @@ protected List generateConfSchema(Application app, int coun if (app == null) { app = generateApplication(null); } - CTLSchema ctlSchema = generateCTLSchema(DEFAULT_FQN, 1, app.getTenant(), null); + CtlSchema ctlSchema = generateCTLSchema(DEFAULT_FQN, 1, app.getTenant(), null); ConfigurationSchema schema; schemas = new ArrayList<>(count); for (int i = 0; i < count; i++) { @@ -219,7 +219,7 @@ protected List generateProfSchema(Application app, int co if (app == null) { app = generateApplication(null); } - CTLSchema ctlSchema = generateCTLSchema(DEFAULT_FQN, 1, app.getTenant(), null); + CtlSchema ctlSchema = generateCTLSchema(DEFAULT_FQN, 1, app.getTenant(), null); EndpointProfileSchema schemaDto; schemas = new ArrayList<>(count); for (int i = 0; i < count; i++) { @@ -240,7 +240,7 @@ protected List generateProfSchema(Application app, int co return schemas; } - protected CTLSchema generateCTLSchema(String fqn, int version, Tenant tenant, CTLSchemaScopeDto scope) { + protected CtlSchema generateCTLSchema(String fqn, int version, Tenant tenant, CTLSchemaScopeDto scope) { if (scope == null) { if (tenant == null) { scope = CTLSchemaScopeDto.SYSTEM; @@ -252,11 +252,11 @@ protected CTLSchema generateCTLSchema(String fqn, int version, Tenant tenant, CT metaInfo.setFqn(fqn); metaInfo.setTenant(tenant); metaInfo = ctlSchemaMetaInfoDao.save(metaInfo); - CTLSchema ctlSchema = new CTLSchema(); + CtlSchema ctlSchema = new CtlSchema(); ctlSchema.setMetaInfo(metaInfo); ctlSchema.setVersion(version); ctlSchema.setBody(UUID.randomUUID().toString()); - ctlSchema.setDependencySet(new HashSet()); + ctlSchema.setDependencySet(new HashSet()); ctlSchema = ctlSchemaDao.save(ctlSchema); return ctlSchema; } @@ -267,7 +267,7 @@ protected List generateNotificationSchema(Application app, i if (app == null) { app = generateApplication(null); } - CTLSchema ctlSchema = generateCTLSchema(DEFAULT_FQN, ctlVersion, app.getTenant(), null); + CtlSchema ctlSchema = generateCTLSchema(DEFAULT_FQN, ctlVersion, app.getTenant(), null); NotificationSchema schemaDto; schemas = new ArrayList<>(count); for (int i = 0; i < count; i++) { @@ -409,7 +409,7 @@ protected List generateEventClassFamilyVersion(EventCla EventClass ec = new EventClass(); ec.setTenant(eventClassFamily.getTenant()); - Optional ctlMaxVersion = ctlSchemaDao.find().stream() + Optional ctlMaxVersion = ctlSchemaDao.find().stream() .max((ctl1, ctl2) -> Integer.compare(ctl1.getVersion(), ctl2.getVersion())); int version = ctlMaxVersion.isPresent() ? (ctlMaxVersion.get().getVersion() + 1) : 1; @@ -487,7 +487,7 @@ protected List generateLogSchema(Tenant tenant, int ctlVersion, Appli if (application == null) { application = generateApplication(tenant); } - CTLSchema ctlSchema = generateCTLSchema(DEFAULT_FQN, ctlVersion, application.getTenant(), null); + CtlSchema ctlSchema = generateCTLSchema(DEFAULT_FQN, ctlVersion, application.getTenant(), null); LogSchema schema; schemas = new ArrayList<>(count); for (int i = 0; i < count; i++) { diff --git a/server/common/dao/src/test/java/org/kaaproject/kaa/server/common/dao/impl/sql/HibernateCtlSchemaDaoTest.java b/server/common/dao/src/test/java/org/kaaproject/kaa/server/common/dao/impl/sql/HibernateCtlSchemaDaoTest.java index b3182360b7..09ec08ece7 100644 --- a/server/common/dao/src/test/java/org/kaaproject/kaa/server/common/dao/impl/sql/HibernateCtlSchemaDaoTest.java +++ b/server/common/dao/src/test/java/org/kaaproject/kaa/server/common/dao/impl/sql/HibernateCtlSchemaDaoTest.java @@ -25,8 +25,8 @@ import org.junit.runner.RunWith; import org.kaaproject.kaa.common.dto.TenantDto; import org.kaaproject.kaa.common.dto.ctl.CTLSchemaDto; -import org.kaaproject.kaa.server.common.dao.CTLService; -import org.kaaproject.kaa.server.common.dao.model.sql.CTLSchema; +import org.kaaproject.kaa.server.common.dao.CtlService; +import org.kaaproject.kaa.server.common.dao.model.sql.CtlSchema; import org.kaaproject.kaa.server.common.dao.model.sql.CTLSchemaMetaInfo; import org.kaaproject.kaa.server.common.dao.model.sql.Tenant; import org.slf4j.Logger; @@ -52,7 +52,7 @@ public class HibernateCtlSchemaDaoTest extends HibernateAbstractTest { private static final Logger LOG = LoggerFactory.getLogger(HibernateCtlSchemaDaoTest.class); private static final String SYSTEM_FQN = "org.kaaproject.kaa.ctl.SystemSchema"; @Autowired - private CTLService ctlService; + private CtlService ctlService; private TenantDto tenant; private CTLSchemaDto firstSchema; private CTLSchemaDto secondSchema; @@ -93,8 +93,8 @@ public void saveCTLSchemaWithSameFqnAndVersion() { ctlSchemaDao.save(generateCTLSchema(DEFAULT_FQN, null, 11, null)); } - private CTLSchema generateCTLSchema(String fqn, Tenant tenant, int version, String body) { - CTLSchema ctlSchema = new CTLSchema(); + private CtlSchema generateCTLSchema(String fqn, Tenant tenant, int version, String body) { + CtlSchema ctlSchema = new CtlSchema(); if (tenant == null) { tenant = generateTenant(); } @@ -124,7 +124,7 @@ public void saveCTLSchemaWithDependency() throws InterruptedException { @Test public void testFindByFqnAndVerAndTenantIdAndApplicationId() { - CTLSchema found = ctlSchemaDao.findByFqnAndVerAndTenantIdAndApplicationId(firstSchema.getMetaInfo().getFqn(), + CtlSchema found = ctlSchemaDao.findByFqnAndVerAndTenantIdAndApplicationId(firstSchema.getMetaInfo().getFqn(), firstSchema.getVersion(), firstSchema.getMetaInfo().getTenantId(), firstSchema.getMetaInfo().getApplicationId()); @@ -133,26 +133,26 @@ public void testFindByFqnAndVerAndTenantIdAndApplicationId() { @Test public void testFindSystemByFqnAndVerAndTenantIdAndApplicationId() { - CTLSchema found = ctlSchemaDao.findByFqnAndVerAndTenantIdAndApplicationId(systemSchema.getMetaInfo().getFqn(), + CtlSchema found = ctlSchemaDao.findByFqnAndVerAndTenantIdAndApplicationId(systemSchema.getMetaInfo().getFqn(), systemSchema.getVersion(), null, null); Assert.assertEquals(systemSchema, found.toDto()); } @Test public void testFindSystemSchemas() { - List found = ctlSchemaDao.findSystemSchemas(); + List found = ctlSchemaDao.findSystemSchemas(); Assert.assertEquals(getIdsDto(Arrays.asList(systemSchema)), getIds(found)); } @Test public void testFindLatestByFqn() { - CTLSchema latest = ctlSchemaDao.findLatestByFqnAndTenantIdAndApplicationId(SYSTEM_FQN, null, null); + CtlSchema latest = ctlSchemaDao.findLatestByFqnAndTenantIdAndApplicationId(SYSTEM_FQN, null, null); Assert.assertEquals(systemSchema, latest.toDto()); } @Test public void testFindAvailableSchemasForTenant() { - List found = ctlSchemaDao.findAvailableSchemasForTenant(tenant.getId()); + List found = ctlSchemaDao.findAvailableSchemasForTenant(tenant.getId()); Assert.assertEquals(getIdsDto(Arrays.asList(firstSchema, secondSchema, thirdSchema, fourthSchema, mainSchema, systemSchema)), getIds(found)); } } diff --git a/server/common/dao/src/test/java/org/kaaproject/kaa/server/common/dao/model/sql/CTLSchemaMetaInfoTest.java b/server/common/dao/src/test/java/org/kaaproject/kaa/server/common/dao/model/sql/CtlSchemaMetaInfoTest.java similarity index 95% rename from server/common/dao/src/test/java/org/kaaproject/kaa/server/common/dao/model/sql/CTLSchemaMetaInfoTest.java rename to server/common/dao/src/test/java/org/kaaproject/kaa/server/common/dao/model/sql/CtlSchemaMetaInfoTest.java index c89289fde4..6a9bd54b05 100644 --- a/server/common/dao/src/test/java/org/kaaproject/kaa/server/common/dao/model/sql/CTLSchemaMetaInfoTest.java +++ b/server/common/dao/src/test/java/org/kaaproject/kaa/server/common/dao/model/sql/CtlSchemaMetaInfoTest.java @@ -21,7 +21,7 @@ import org.junit.Test; -public class CTLSchemaMetaInfoTest { +public class CtlSchemaMetaInfoTest { @Test public void hashCodeEqualsTest() { EqualsVerifier.forClass(CTLSchemaMetaInfo.class).usingGetClass().verify(); diff --git a/server/common/dao/src/test/java/org/kaaproject/kaa/server/common/dao/model/sql/CTLSchemaTest.java b/server/common/dao/src/test/java/org/kaaproject/kaa/server/common/dao/model/sql/CtlSchemaTest.java similarity index 89% rename from server/common/dao/src/test/java/org/kaaproject/kaa/server/common/dao/model/sql/CTLSchemaTest.java rename to server/common/dao/src/test/java/org/kaaproject/kaa/server/common/dao/model/sql/CtlSchemaTest.java index dda4f2e03a..a3afcb8e08 100644 --- a/server/common/dao/src/test/java/org/kaaproject/kaa/server/common/dao/model/sql/CTLSchemaTest.java +++ b/server/common/dao/src/test/java/org/kaaproject/kaa/server/common/dao/model/sql/CtlSchemaTest.java @@ -21,9 +21,9 @@ import org.junit.Test; -public class CTLSchemaTest { +public class CtlSchemaTest { @Test public void hashCodeEqualsTest() { - EqualsVerifier.forClass(CTLSchema.class).usingGetClass().verify(); + EqualsVerifier.forClass(CtlSchema.class).usingGetClass().verify(); } } diff --git a/server/common/dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/AbstractServiceImplTest.java b/server/common/dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/AbstractServiceImplTest.java index f7e68351aa..d4fa4280c5 100644 --- a/server/common/dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/AbstractServiceImplTest.java +++ b/server/common/dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/AbstractServiceImplTest.java @@ -28,7 +28,7 @@ import org.kaaproject.kaa.common.dto.ctl.CTLSchemaDto; import org.kaaproject.kaa.common.dto.ctl.CTLSchemaMetaInfoDto; import org.kaaproject.kaa.server.common.dao.ApplicationService; -import org.kaaproject.kaa.server.common.dao.CTLService; +import org.kaaproject.kaa.server.common.dao.CtlService; import org.kaaproject.kaa.server.common.dao.ConfigurationService; import org.kaaproject.kaa.server.common.dao.EndpointService; import org.kaaproject.kaa.server.common.dao.ProfileService; @@ -63,7 +63,7 @@ public abstract class AbstractServiceImplTest { @Autowired protected ApplicationService applicationService; @Autowired - protected CTLService ctlService; + protected CtlService ctlService; @Autowired protected ProfileService profileService; @Autowired diff --git a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/AbstractDetailDto.java b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/AbstractDetailDto.java index c640541ced..c6f95ba4ee 100644 --- a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/AbstractDetailDto.java +++ b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/AbstractDetailDto.java @@ -30,6 +30,9 @@ public abstract class AbstractDetailDto implements Serializable { public AbstractDetailDto() { } + /** + * Instantiates the AbstractDetailDto. + */ public AbstractDetailDto(AbstractDetailDto detailsDto) { this.name = detailsDto.getName(); this.description = detailsDto.getDescription(); diff --git a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/AbstractStructureDto.java b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/AbstractStructureDto.java index a452279f5f..79fa732f29 100644 --- a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/AbstractStructureDto.java +++ b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/AbstractStructureDto.java @@ -43,6 +43,9 @@ public abstract class AbstractStructureDto implements HasId, Serializable { public AbstractStructureDto() { } + /** + * All-args constructor. + */ public AbstractStructureDto(AbstractStructureDto other) { this.id = other.id; this.applicationId = other.applicationId; diff --git a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/ChangeType.java b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/ChangeType.java index e7a09196eb..c9ec5d7856 100644 --- a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/ChangeType.java +++ b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/ChangeType.java @@ -34,6 +34,12 @@ public enum ChangeType { REMOVE_NOTIFICATION_VERSION; + /** + * Returns the ChangeType from a string. + * + * @param stringType string type value + * @return change type + */ public static ChangeType typeFromString(String stringType) { for (ChangeType type : ChangeType.values()) { if (type.name().equalsIgnoreCase(stringType)) { diff --git a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/ConfigurationRecordDto.java b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/ConfigurationRecordDto.java index 7516f0bc5c..bf1b204c5b 100644 --- a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/ConfigurationRecordDto.java +++ b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/ConfigurationRecordDto.java @@ -39,6 +39,12 @@ public ConfigurationRecordDto( super(activeConfiguration, inactiveConfiguration); } + /** + * Converts a configuration into a configuration record. + * + * @param configurations + * @return + */ public static List convertToConfigurationRecords( Collection configurations) { Map configurationRecordsMap = new HashMap<>(); diff --git a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/CTLDataDto.java b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/CtlDataDto.java similarity index 90% rename from server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/CTLDataDto.java rename to server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/CtlDataDto.java index 9bb38ef39e..35dd5f71ab 100644 --- a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/CTLDataDto.java +++ b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/CtlDataDto.java @@ -18,17 +18,17 @@ import java.io.Serializable; -public class CTLDataDto implements Serializable { +public class CtlDataDto implements Serializable { private static final long serialVersionUID = -9107671325547868060L; private int serverProfileVersion; private String body; - public CTLDataDto() { + public CtlDataDto() { } - public CTLDataDto(int serverProfileVersion, String body) { + public CtlDataDto(int serverProfileVersion, String body) { this.serverProfileVersion = serverProfileVersion; this.body = body; } @@ -69,7 +69,7 @@ public boolean equals(Object obj) { if (getClass() != obj.getClass()) { return false; } - CTLDataDto other = (CTLDataDto) obj; + CtlDataDto other = (CtlDataDto) obj; if (body == null) { if (other.body != null) { return false; @@ -86,7 +86,7 @@ public boolean equals(Object obj) { @Override public String toString() { StringBuilder builder = new StringBuilder(); - builder.append("CTLDataDto [serverProfileVersion="); + builder.append("CtlDataDto [serverProfileVersion="); builder.append(serverProfileVersion); builder.append(", body="); builder.append(body); diff --git a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/DtoByteMarshaller.java b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/DtoByteMarshaller.java index f962fc97b5..4831a9d921 100644 --- a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/DtoByteMarshaller.java +++ b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/DtoByteMarshaller.java @@ -36,6 +36,13 @@ public class DtoByteMarshaller { private DtoByteMarshaller() { } + /** + * Converts an object ot byte array. + * + * @param object object + * @param generic type + * @return byte array + */ public static byte[] toBytes(T object) { ByteArrayOutputStream byteStream = new ByteArrayOutputStream(); try { @@ -47,6 +54,11 @@ public static byte[] toBytes(T object) { return byteStream.toByteArray(); } + /** + * Converts a byte array to an object. + * + * @param bytes byte array + */ @SuppressWarnings("unchecked") public static T fromBytes(byte[] bytes) { ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes); diff --git a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/EndpointGroupStateDto.java b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/EndpointGroupStateDto.java index 5005bd5e91..5b8079a605 100644 --- a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/EndpointGroupStateDto.java +++ b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/EndpointGroupStateDto.java @@ -30,6 +30,9 @@ public EndpointGroupStateDto() { super(); } + /** + * All-args constructor. + */ public EndpointGroupStateDto(String endpointGroupId, String profileFilterId, String configurationId) { super(); diff --git a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/EndpointProfileBodyDto.java b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/EndpointProfileBodyDto.java index b4bcc5f5a5..075eb77099 100644 --- a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/EndpointProfileBodyDto.java +++ b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/EndpointProfileBodyDto.java @@ -36,6 +36,9 @@ public class EndpointProfileBodyDto implements Serializable { public EndpointProfileBodyDto() { } + /** + * All-args constructor. + */ public EndpointProfileBodyDto(byte[] endpointKeyHash, String clientSideProfile, String serverSideProfile, int clientSideProfileVersion, int serverSideProfileVersion, String appId) { diff --git a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/EndpointProfileDataDto.java b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/EndpointProfileDataDto.java index 26e2790739..31ab3a1e97 100644 --- a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/EndpointProfileDataDto.java +++ b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/EndpointProfileDataDto.java @@ -26,6 +26,9 @@ public class EndpointProfileDataDto { private final int clientProfileVersion; private final int serverProfileVersion; + /** + * All-args constructor. + */ public EndpointProfileDataDto(String id, String endpointKey, int clientProfileVersion, String clientProfileBody, int serverProfileVersion, String serverProfileBody) { diff --git a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/EndpointProfilesBodyDto.java b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/EndpointProfilesBodyDto.java index d4b4cd9b6e..fdc4b11d19 100644 --- a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/EndpointProfilesBodyDto.java +++ b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/EndpointProfilesBodyDto.java @@ -31,6 +31,11 @@ public EndpointProfilesBodyDto(List endpointProfileBody) this.endpointProfilesBody = endpointProfileBody; } + /** + * Tests whether endpoint body is present. + * + * @return true if endpoint body is present otherwise false + */ public boolean hasEndpointBodies() { boolean result = false; if (endpointProfilesBody != null) { diff --git a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/EndpointProfilesPageDto.java b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/EndpointProfilesPageDto.java index 49e042546b..41bb274492 100644 --- a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/EndpointProfilesPageDto.java +++ b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/EndpointProfilesPageDto.java @@ -39,6 +39,11 @@ public void setEndpointProfiles(List endpointProfiles) { this.endpointProfiles = endpointProfiles; } + /** + * Checks whether endpoint profiles exists. + * + * @return true if endpoint profiles exists otherwise false + */ public boolean hasEndpointProfiles() { boolean result = false; if (endpointProfiles != null) { diff --git a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/KaaAuthorityDto.java b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/KaaAuthorityDto.java index 2beff86aac..3f2dc72ab5 100644 --- a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/KaaAuthorityDto.java +++ b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/KaaAuthorityDto.java @@ -32,6 +32,12 @@ public enum KaaAuthorityDto { this.key = key; } + /** + * Parses the KaaAuthorityDto from a string. + * + * @param value string value + * @return KaaAuthorityDto + */ public static KaaAuthorityDto parse(String value) { KaaAuthorityDto authority = null; if (value != null && value.length() != 0) { @@ -45,6 +51,12 @@ public static KaaAuthorityDto parse(String value) { return authority; } + /** + * Parses KaaAuthorityDtos from strins. + * + * @param values string values + * @return KaaAuthorityDtos + */ public static List parseList(String... values) { List authorities = null; if (values != null && values.length != 0) { diff --git a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/PageLinkDto.java b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/PageLinkDto.java index eba07257af..44d5f99061 100644 --- a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/PageLinkDto.java +++ b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/PageLinkDto.java @@ -35,6 +35,9 @@ public class PageLinkDto implements Serializable { public PageLinkDto() { } + /** + * All-args constructor. + */ public PageLinkDto(String endpointGroupId, String limit, String offset) { this.endpointGroupId = endpointGroupId; this.limit = limit; @@ -83,6 +86,11 @@ public void setApplicationId(String applicationId) { this.applicationId = applicationId; } + /** + * Returns the next url part. + * + * @return next url part + */ public String getNextUrlPart() { String nextUrlPart = null; if (limit != null && offset != null) { diff --git a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/ProfileFilterRecordDto.java b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/ProfileFilterRecordDto.java index 884b3b51ff..a9dc26961a 100644 --- a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/ProfileFilterRecordDto.java +++ b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/ProfileFilterRecordDto.java @@ -39,6 +39,9 @@ public ProfileFilterRecordDto(ProfileFilterDto activeProfileFilter, super(activeProfileFilter, inactiveProfileFilter); } + /** + * All-args constructor. + */ public static List convertToProfileFilterRecords( Collection profileFilters) { Map profileFiltterRecordsMap = new HashMap<>(); @@ -82,24 +85,29 @@ public String getEndpointProfileSchemaId() { @JsonIgnore public String getServerProfileSchemaId() { - return activeStructureDto != null ? activeStructureDto.getServerProfileSchemaId() : - inactiveStructureDto.getServerProfileSchemaId(); + return activeStructureDto != null + ? activeStructureDto.getServerProfileSchemaId() + : inactiveStructureDto.getServerProfileSchemaId(); } @Override public int compareTo(ProfileFilterRecordDto profileFilterRecordDto) { - int endpointProfileShemaVersion = getEndpointProfileSchemaVersion() != null ? - getEndpointProfileSchemaVersion() : -1; - int otherEndpointProfileShemaVersion = profileFilterRecordDto.getEndpointProfileSchemaVersion() - != null ? profileFilterRecordDto - .getEndpointProfileSchemaVersion() : -1; + int endpointProfileShemaVersion = getEndpointProfileSchemaVersion() != null + ? getEndpointProfileSchemaVersion() + : -1; + int otherEndpointProfileShemaVersion = + profileFilterRecordDto.getEndpointProfileSchemaVersion() != null + ? profileFilterRecordDto.getEndpointProfileSchemaVersion() + : -1; int result = endpointProfileShemaVersion - otherEndpointProfileShemaVersion; if (result == 0) { - int serverProfileShemaVersion = getServerProfileSchemaVersion() != null ? - getServerProfileSchemaVersion() : -1; - int otherServerProfileShemaVersion = profileFilterRecordDto.getServerProfileSchemaVersion() - != null ? profileFilterRecordDto - .getServerProfileSchemaVersion() : -1; + int serverProfileShemaVersion = getServerProfileSchemaVersion() != null + ? getServerProfileSchemaVersion() + : -1; + int otherServerProfileShemaVersion = + profileFilterRecordDto.getServerProfileSchemaVersion() != null + ? profileFilterRecordDto.getServerProfileSchemaVersion() + : -1; result = serverProfileShemaVersion - otherServerProfileShemaVersion; } return result; diff --git a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/ProfileVersionPairDto.java b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/ProfileVersionPairDto.java index 87d65da7ab..cf1193726c 100644 --- a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/ProfileVersionPairDto.java +++ b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/ProfileVersionPairDto.java @@ -41,6 +41,9 @@ public ProfileVersionPairDto(String serverProfileSchemaid, Integer serverProfile this.serverProfileSchemaVersion = serverProfileSchemaVersion; } + /** + * All-args constructor. + */ public ProfileVersionPairDto(String endpointProfileSchemaid, Integer endpointProfileSchemaVersion, String serverProfileSchemaid, Integer serverProfileSchemaVersion) { diff --git a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/TopicListEntryDto.java b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/TopicListEntryDto.java index ac86ce73f6..2ee191ef95 100644 --- a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/TopicListEntryDto.java +++ b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/TopicListEntryDto.java @@ -30,6 +30,9 @@ public final class TopicListEntryDto implements Serializable { private List topics; + /** + * All-args constructor. + */ public TopicListEntryDto(int simpleHash, byte[] hash, List topics) { this.simpleHash = simpleHash; this.hash = hash; diff --git a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/UpdateStatus.java b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/UpdateStatus.java index 615385e5da..d42020421b 100644 --- a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/UpdateStatus.java +++ b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/UpdateStatus.java @@ -20,6 +20,12 @@ public enum UpdateStatus { DEPRECATED, ACTIVE, INACTIVE; + /** + * Parses a update status from a string value. + * + * @param stringStatus update status string value + * @return update status + */ public static UpdateStatus statusFromString(String stringStatus) { for (UpdateStatus status : UpdateStatus.values()) { if (status.name().equalsIgnoreCase(stringStatus)) { diff --git a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/Util.java b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/Util.java index 71894587d8..800a5532c6 100644 --- a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/Util.java +++ b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/Util.java @@ -23,6 +23,12 @@ public class Util { private Util() { } + /** + * Copies an array. + * + * @param array array + * @return array copy + */ public static byte[] getArrayCopy(byte[] array) { byte[] bytes = null; if (array != null) { diff --git a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/admin/AuthResultDto.java b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/admin/AuthResultDto.java index 40d6f45b81..6215242f1f 100644 --- a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/admin/AuthResultDto.java +++ b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/admin/AuthResultDto.java @@ -33,6 +33,9 @@ public class AuthResultDto implements Serializable { public AuthResultDto() { } + /** + * All-args constructor. + */ public AuthResultDto(String username, String displayName, KaaAuthorityDto authority) { super(); this.username = username; diff --git a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/admin/RecordKey.java b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/admin/RecordKey.java index 0cc10822fa..f5a498f65d 100644 --- a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/admin/RecordKey.java +++ b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/admin/RecordKey.java @@ -29,6 +29,9 @@ public class RecordKey implements Serializable { public RecordKey() { } + /** + * All-args constructor. + */ public RecordKey(String applicationId, int schemaVersion, RecordFiles recordFiles) { this.applicationId = applicationId; this.schemaVersion = schemaVersion; diff --git a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/admin/SdkProfileDto.java b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/admin/SdkProfileDto.java index 35edcbdeaa..c88a865904 100644 --- a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/admin/SdkProfileDto.java +++ b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/admin/SdkProfileDto.java @@ -35,6 +35,9 @@ public SdkProfileDto() { super(); } + /** + * All-args constructor. + */ public SdkProfileDto(String applicationId, Integer configurationSchemaVersion, Integer profileSchemaVersion, Integer notificationSchemaVersion, Integer logSchemaVersion, @@ -103,6 +106,11 @@ public void setId(String id) { this.id = id; } + /** + * Converts the current sdk profile to a sdk token. + * + * @return sdk token + */ public SdkTokenDto toSdkTokenDto() { return new SdkTokenDto(configurationSchemaVersion, profileSchemaVersion, diff --git a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/admin/SdkTokenDto.java b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/admin/SdkTokenDto.java index cd71fd30d8..7877ac0ec6 100644 --- a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/admin/SdkTokenDto.java +++ b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/admin/SdkTokenDto.java @@ -36,6 +36,9 @@ public SdkTokenDto() { super(); } + /** + * All-args constructor. + */ public SdkTokenDto(Integer configurationSchemaVersion, Integer profileSchemaVersion, Integer notificationSchemaVersion, Integer logSchemaVersion, List aefMapIds, diff --git a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/admin/UserDto.java b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/admin/UserDto.java index 0ef824b544..16ea99a981 100644 --- a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/admin/UserDto.java +++ b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/admin/UserDto.java @@ -42,6 +42,9 @@ public class UserDto extends org.kaaproject.kaa.common.dto.UserDto { public UserDto() { } + /** + * All-args constructor. + */ public UserDto(String externalUid, String username, String firstName, diff --git a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/admin/UserProfileUpdateDto.java b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/admin/UserProfileUpdateDto.java index b0c4cd20ec..4bd24059be 100644 --- a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/admin/UserProfileUpdateDto.java +++ b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/admin/UserProfileUpdateDto.java @@ -26,12 +26,18 @@ public class UserProfileUpdateDto implements Serializable { private String lastName; private String mail; + /** + * Instantiates the UserProfileUpdateDto. + */ public UserProfileUpdateDto(String firstName, String lastName, String mail) { this.firstName = firstName; this.lastName = lastName; this.mail = mail; } + /** + * Instantiates the UserProfileUpdateDto. + */ public UserProfileUpdateDto(UserDto userDto) { this.firstName = userDto.getFirstName(); this.lastName = userDto.getLastName(); diff --git a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/credentials/CredentialsDto.java b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/credentials/CredentialsDto.java index 895edf595d..cab46ee895 100644 --- a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/credentials/CredentialsDto.java +++ b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/credentials/CredentialsDto.java @@ -46,6 +46,9 @@ public CredentialsDto(byte[] credentialsBody, CredentialsStatus status) { this(null, credentialsBody, status); } + /** + * Instantiates the CredentialsDto. + */ public CredentialsDto(String credentialsId, byte[] credentialsBody, CredentialsStatus status) { this.id = credentialsId; this.credentialsBody = credentialsBody != null ? Arrays.copyOf(credentialsBody, diff --git a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/credentials/EndpointRegistrationDto.java b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/credentials/EndpointRegistrationDto.java index 3fd0a61993..3f271cc728 100644 --- a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/credentials/EndpointRegistrationDto.java +++ b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/credentials/EndpointRegistrationDto.java @@ -39,6 +39,9 @@ public final class EndpointRegistrationDto implements HasId, Serializable { public EndpointRegistrationDto() { } + /** + * All-args constructor. + */ public EndpointRegistrationDto(String applicationId, String endpointId, String credentialsId, Integer serverProfileVersion, String serverProfileBody) { this.applicationId = applicationId; diff --git a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/logs/LogAppenderDto.java b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/logs/LogAppenderDto.java index 39f8cce4f2..502f3f1b9e 100644 --- a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/logs/LogAppenderDto.java +++ b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/logs/LogAppenderDto.java @@ -36,6 +36,9 @@ public LogAppenderDto() { super(); } + /** + * All-args constructor. + */ public LogAppenderDto(LogAppenderDto logAppenderDto) { super(logAppenderDto); this.applicationToken = logAppenderDto.getApplicationToken(); diff --git a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/logs/security/MongoRoleDto.java b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/logs/security/MongoRoleDto.java index 1732fedc04..0cd9304b01 100644 --- a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/logs/security/MongoRoleDto.java +++ b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/logs/security/MongoRoleDto.java @@ -30,10 +30,16 @@ public class MongoRoleDto implements HasId, Serializable { private List privileges; private List roles; + /** + * Instantiates the MongoUserDto. + */ public MongoRoleDto() { } + /** + * All-args constructor. + */ public MongoRoleDto(String role, List privileges, List roles) { this.role = role; this.privileges = privileges; diff --git a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/logs/security/MongoUserDto.java b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/logs/security/MongoUserDto.java index 8a88140434..7e1edb0c6d 100644 --- a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/logs/security/MongoUserDto.java +++ b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/logs/security/MongoUserDto.java @@ -30,10 +30,16 @@ public class MongoUserDto implements HasId, Serializable { private String pwd; private List roles; + /** + * Instantiates the MongoUserDto. + */ public MongoUserDto() { } + /** + * All-args constructor. + */ public MongoUserDto(String user, String pwd, List roles) { this.user = user; this.pwd = pwd; diff --git a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/plugin/PluginDto.java b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/plugin/PluginDto.java index e6c6bc09c1..87e6a31c79 100755 --- a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/plugin/PluginDto.java +++ b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/plugin/PluginDto.java @@ -43,6 +43,9 @@ public PluginDto() { super(); } + /** + * Instantiates the PluginDto. + */ public PluginDto(PluginDto pluginDto) { super(pluginDto); this.id = pluginDto.getId(); diff --git a/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/CassandraCTLSchemaServiceImplTest.java b/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/CassandraCtlSchemaServiceImplTest.java similarity index 94% rename from server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/CassandraCTLSchemaServiceImplTest.java rename to server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/CassandraCtlSchemaServiceImplTest.java index 622ef6c741..b738309f52 100644 --- a/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/CassandraCTLSchemaServiceImplTest.java +++ b/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/dao/service/CassandraCtlSchemaServiceImplTest.java @@ -24,6 +24,6 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = "/cassandra-dao-test-context.xml") @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS) -public class CassandraCTLSchemaServiceImplTest extends CtlServiceImplTest { +public class CassandraCtlSchemaServiceImplTest extends CtlServiceImplTest { } diff --git a/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/nosql/cassandra/dao/AbstractCassandraTest.java b/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/nosql/cassandra/dao/AbstractCassandraTest.java index 8d14a39049..27e8f8d93e 100644 --- a/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/nosql/cassandra/dao/AbstractCassandraTest.java +++ b/server/common/nosql/cassandra-dao/src/test/java/org/kaaproject/kaa/server/common/nosql/cassandra/dao/AbstractCassandraTest.java @@ -16,7 +16,7 @@ package org.kaaproject.kaa.server.common.nosql.cassandra.dao; -import org.kaaproject.kaa.common.dto.CTLDataDto; +import org.kaaproject.kaa.common.dto.CtlDataDto; import org.kaaproject.kaa.common.dto.EndpointGroupStateDto; import org.kaaproject.kaa.common.dto.EndpointProfileDto; import org.kaaproject.kaa.common.dto.EndpointUserDto; @@ -121,7 +121,7 @@ protected List generateConfiguration(int count) return configurations; } - protected EndpointProfileDto generateEndpointProfile(CTLDataDto dataDto) { + protected EndpointProfileDto generateEndpointProfile(CtlDataDto dataDto) { return generateEndpointProfile(null, null, null, null, dataDto); } @@ -129,7 +129,7 @@ protected EndpointProfileDto generateEndpointProfile(String appId, String sdkTok return generateEndpointProfile(appId, sdkToken, accessToken, topicIds, null); } - protected EndpointProfileDto generateEndpointProfile(String appId, String sdkToken, String accessToken, List topicIds, CTLDataDto ctlDataDto) { + protected EndpointProfileDto generateEndpointProfile(String appId, String sdkToken, String accessToken, List topicIds, CtlDataDto ctlDataDto) { byte[] keyHash = generateBytes(); if (appId == null) { diff --git a/server/node/src/main/java/org/kaaproject/kaa/server/control/service/DefaultControlService.java b/server/node/src/main/java/org/kaaproject/kaa/server/control/service/DefaultControlService.java index bb9edacd13..337fedb293 100644 --- a/server/node/src/main/java/org/kaaproject/kaa/server/control/service/DefaultControlService.java +++ b/server/node/src/main/java/org/kaaproject/kaa/server/control/service/DefaultControlService.java @@ -89,7 +89,7 @@ import org.kaaproject.kaa.server.common.core.schema.ProtocolSchema; import org.kaaproject.kaa.server.common.dao.ApplicationEventMapService; import org.kaaproject.kaa.server.common.dao.ApplicationService; -import org.kaaproject.kaa.server.common.dao.CTLService; +import org.kaaproject.kaa.server.common.dao.CtlService; import org.kaaproject.kaa.server.common.dao.ConfigurationService; import org.kaaproject.kaa.server.common.dao.EndpointRegistrationService; import org.kaaproject.kaa.server.common.dao.EndpointService; @@ -296,7 +296,7 @@ public class DefaultControlService implements ControlService { private SdkProfileService sdkProfileService; @Autowired - private CTLService ctlService; + private CtlService ctlService; @Autowired @Qualifier("rootCredentialsServiceLocator") diff --git a/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/akka/AkkaContext.java b/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/akka/AkkaContext.java index 05b69a1a6b..da29ff5df7 100644 --- a/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/akka/AkkaContext.java +++ b/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/akka/AkkaContext.java @@ -20,7 +20,7 @@ import com.typesafe.config.ConfigFactory; import org.kaaproject.kaa.server.common.dao.ApplicationService; -import org.kaaproject.kaa.server.common.dao.CTLService; +import org.kaaproject.kaa.server.common.dao.CtlService; import org.kaaproject.kaa.server.node.service.credentials.CredentialsServiceLocator; import org.kaaproject.kaa.server.node.service.registration.RegistrationService; import org.kaaproject.kaa.server.operations.service.OperationsService; @@ -88,7 +88,7 @@ public class AkkaContext { @Autowired private RegistrationService registrationService; @Autowired - private CTLService ctlService; + private CtlService ctlService; @Value("#{properties[support_unencrypted_connection]}") private Boolean supportUnencryptedConnection; @@ -156,7 +156,7 @@ public EndpointUserService getEndpointUserService() { return endpointUserService; } - public CTLService getCtlService() { + public CtlService getCtlService() { return ctlService; } diff --git a/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/akka/actors/core/ApplicationLogActorMessageProcessor.java b/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/akka/actors/core/ApplicationLogActorMessageProcessor.java index ac366c5450..75e70858ac 100644 --- a/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/akka/actors/core/ApplicationLogActorMessageProcessor.java +++ b/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/akka/actors/core/ApplicationLogActorMessageProcessor.java @@ -23,7 +23,7 @@ import org.kaaproject.kaa.common.dto.EndpointProfileSchemaDto; import org.kaaproject.kaa.common.dto.ServerProfileSchemaDto; import org.kaaproject.kaa.common.dto.ctl.CTLSchemaDto; -import org.kaaproject.kaa.server.common.dao.CTLService; +import org.kaaproject.kaa.server.common.dao.CtlService; import org.kaaproject.kaa.server.common.log.shared.appender.LogAppender; import org.kaaproject.kaa.server.common.log.shared.appender.LogDeliveryCallback; import org.kaaproject.kaa.server.common.log.shared.appender.LogDeliveryErrorCode; @@ -58,7 +58,7 @@ public class ApplicationLogActorMessageProcessor { private final LogAppenderService logAppenderService; private final CacheService cacheService; - private final CTLService ctlService; + private final CtlService ctlService; private final Map logAppenders; diff --git a/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/cache/concurrent/ConcurrentCacheService.java b/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/cache/concurrent/ConcurrentCacheService.java index d6f65eab17..c82084eb43 100644 --- a/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/cache/concurrent/ConcurrentCacheService.java +++ b/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/cache/concurrent/ConcurrentCacheService.java @@ -44,7 +44,7 @@ import org.kaaproject.kaa.server.common.core.structure.Pair; import org.kaaproject.kaa.server.common.dao.ApplicationEventMapService; import org.kaaproject.kaa.server.common.dao.ApplicationService; -import org.kaaproject.kaa.server.common.dao.CTLService; +import org.kaaproject.kaa.server.common.dao.CtlService; import org.kaaproject.kaa.server.common.dao.ConfigurationService; import org.kaaproject.kaa.server.common.dao.EndpointService; import org.kaaproject.kaa.server.common.dao.EventClassService; @@ -291,7 +291,7 @@ public class ConcurrentCacheService implements CacheService { @Autowired private ServerProfileService serverProfileService; @Autowired - private CTLService ctlService; + private CtlService ctlService; /** * The history service. */ diff --git a/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/logs/DefaultLogAppenderService.java b/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/logs/DefaultLogAppenderService.java index b19c19749a..e03feae439 100644 --- a/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/logs/DefaultLogAppenderService.java +++ b/server/node/src/main/java/org/kaaproject/kaa/server/operations/service/logs/DefaultLogAppenderService.java @@ -19,7 +19,7 @@ import org.kaaproject.kaa.common.dto.ctl.CTLSchemaDto; import org.kaaproject.kaa.common.dto.logs.LogAppenderDto; import org.kaaproject.kaa.common.dto.logs.LogSchemaDto; -import org.kaaproject.kaa.server.common.dao.CTLService; +import org.kaaproject.kaa.server.common.dao.CtlService; import org.kaaproject.kaa.server.common.dao.LogAppendersService; import org.kaaproject.kaa.server.common.dao.LogSchemaService; import org.kaaproject.kaa.server.common.log.shared.appender.LogAppender; @@ -47,7 +47,7 @@ public class DefaultLogAppenderService implements LogAppenderService { private LogAppenderBuilder logAppenderResolver; @Autowired - private CTLService ctlService; + private CtlService ctlService; @Autowired private LogAppendersService logAppendersService; diff --git a/server/node/src/test/java/org/kaaproject/kaa/server/operations/service/OperationsServiceIT.java b/server/node/src/test/java/org/kaaproject/kaa/server/operations/service/OperationsServiceIT.java index d1f8c5f663..e3585d179b 100644 --- a/server/node/src/test/java/org/kaaproject/kaa/server/operations/service/OperationsServiceIT.java +++ b/server/node/src/test/java/org/kaaproject/kaa/server/operations/service/OperationsServiceIT.java @@ -48,7 +48,7 @@ import org.kaaproject.kaa.server.common.dao.impl.TenantDao; import org.kaaproject.kaa.server.common.dao.model.EndpointConfiguration; import org.kaaproject.kaa.server.common.dao.model.sql.Application; -import org.kaaproject.kaa.server.common.dao.model.sql.CTLSchema; +import org.kaaproject.kaa.server.common.dao.model.sql.CtlSchema; import org.kaaproject.kaa.server.common.dao.model.sql.CTLSchemaMetaInfo; import org.kaaproject.kaa.server.common.dao.model.sql.ConfigurationSchema; import org.kaaproject.kaa.server.common.dao.model.sql.EndpointGroup; @@ -245,11 +245,11 @@ public void beforeTest() throws IOException, NoSuchAlgorithmException, SQLExcept metaInfo = ctlSchemaMetaInfoDao.save(metaInfo); - CTLSchema ctlSchema = new CTLSchema(); + CtlSchema ctlSchema = new CtlSchema(); ctlSchema.setMetaInfo(metaInfo); ctlSchema.setVersion(1); ctlSchema.setBody(BasicEndpointProfile.SCHEMA$.toString()); - ctlSchema.setDependencySet(new HashSet()); + ctlSchema.setDependencySet(new HashSet()); ctlSchema = ctlSchemaDao.save(ctlSchema); diff --git a/server/node/src/test/java/org/kaaproject/kaa/server/operations/service/akka/DefaultAkkaServiceTest.java b/server/node/src/test/java/org/kaaproject/kaa/server/operations/service/akka/DefaultAkkaServiceTest.java index 6a238f8fea..36a218fea3 100644 --- a/server/node/src/test/java/org/kaaproject/kaa/server/operations/service/akka/DefaultAkkaServiceTest.java +++ b/server/node/src/test/java/org/kaaproject/kaa/server/operations/service/akka/DefaultAkkaServiceTest.java @@ -75,7 +75,7 @@ import org.kaaproject.kaa.common.hash.Sha1HashUtils; import org.kaaproject.kaa.server.common.Base64Util; import org.kaaproject.kaa.server.common.dao.ApplicationService; -import org.kaaproject.kaa.server.common.dao.CTLService; +import org.kaaproject.kaa.server.common.dao.CtlService; import org.kaaproject.kaa.server.common.dao.exception.CredentialsServiceException; import org.kaaproject.kaa.server.common.dao.exception.EndpointRegistrationServiceException; import org.kaaproject.kaa.server.common.log.shared.appender.LogAppender; @@ -204,7 +204,7 @@ public class DefaultAkkaServiceTest { private NotificationDto topicNotification; private LogAppenderService logAppenderService; private EndpointUserService endpointUserService; - private CTLService ctlService; + private CtlService ctlService; private CredentialsServiceLocator credentialsServiceLocator; private CredentialsService credentialsService; private RegistrationService registrationService; @@ -236,7 +236,7 @@ public void before() throws GeneralSecurityException, CredentialsServiceExceptio eventService = mock(EventService.class); logAppenderService = mock(LogAppenderService.class); endpointUserService = mock(EndpointUserService.class); - ctlService = mock(CTLService.class); + ctlService = mock(CtlService.class); credentialsServiceLocator = mock(CredentialsServiceLocator.class); credentialsService = mock(CredentialsService.class); registrationService = mock(RegistrationService.class); diff --git a/server/node/src/test/java/org/kaaproject/kaa/server/operations/service/akka/actors/core/ApplicationLogActorMessageProcessorTest.java b/server/node/src/test/java/org/kaaproject/kaa/server/operations/service/akka/actors/core/ApplicationLogActorMessageProcessorTest.java index 6a4d90a02e..c909fbbe53 100644 --- a/server/node/src/test/java/org/kaaproject/kaa/server/operations/service/akka/actors/core/ApplicationLogActorMessageProcessorTest.java +++ b/server/node/src/test/java/org/kaaproject/kaa/server/operations/service/akka/actors/core/ApplicationLogActorMessageProcessorTest.java @@ -30,7 +30,7 @@ import org.kaaproject.kaa.common.dto.ctl.CTLSchemaMetaInfoDto; import org.kaaproject.kaa.common.dto.logs.LogSchemaDto; import org.kaaproject.kaa.server.common.dao.ApplicationService; -import org.kaaproject.kaa.server.common.dao.CTLService; +import org.kaaproject.kaa.server.common.dao.CtlService; import org.kaaproject.kaa.server.common.log.shared.appender.LogAppender; import org.kaaproject.kaa.server.common.log.shared.appender.LogEvent; import org.kaaproject.kaa.server.common.log.shared.appender.LogEventPack; @@ -89,7 +89,7 @@ public class ApplicationLogActorMessageProcessorTest { private LogAppenderService logAppenderService; private CacheService cacheService; - private CTLService ctlService; + private CtlService ctlService; private LogEventPackMessage message; @@ -139,7 +139,7 @@ public void before() throws Exception { serverProfileSchema.setCtlSchemaId(SERVER_PROFILE_SCHEMA_CTL_SCHEMA_ID); cacheService = Mockito.mock(CacheService.class); - ctlService = Mockito.mock(CTLService.class); + ctlService = Mockito.mock(CtlService.class); // Cache services AppVersionKey key; diff --git a/server/node/src/test/java/org/kaaproject/kaa/server/operations/service/akka/actors/core/ApplicationLogActorTest.java b/server/node/src/test/java/org/kaaproject/kaa/server/operations/service/akka/actors/core/ApplicationLogActorTest.java index b4a6dd82d6..f428b196b2 100644 --- a/server/node/src/test/java/org/kaaproject/kaa/server/operations/service/akka/actors/core/ApplicationLogActorTest.java +++ b/server/node/src/test/java/org/kaaproject/kaa/server/operations/service/akka/actors/core/ApplicationLogActorTest.java @@ -32,7 +32,7 @@ import org.kaaproject.kaa.common.dto.ctl.CTLSchemaDto; import org.kaaproject.kaa.common.dto.logs.LogSchemaDto; import org.kaaproject.kaa.server.common.dao.ApplicationService; -import org.kaaproject.kaa.server.common.dao.CTLService; +import org.kaaproject.kaa.server.common.dao.CtlService; import org.kaaproject.kaa.server.common.log.shared.appender.LogAppender; import org.kaaproject.kaa.server.common.log.shared.appender.LogDeliveryCallback; import org.kaaproject.kaa.server.common.log.shared.appender.LogEvent; @@ -73,7 +73,7 @@ public class ApplicationLogActorTest { private LogAppenderService logAppenderService; private ApplicationService applicationService; private CacheService cacheService; - private CTLService ctlService; + private CtlService ctlService; private ApplicationDto applicationDto; private List logAppenders; private LogSchema logSchema; @@ -86,7 +86,7 @@ public void before() throws Exception { applicationService = mock(ApplicationService.class); cacheService = mock(CacheService.class); applicationDto = mock(ApplicationDto.class); - ctlService = mock(CTLService.class); + ctlService = mock(CtlService.class); when(context.getCacheService()).thenReturn(cacheService); when(context.getApplicationService()).thenReturn(applicationService); diff --git a/server/node/src/test/java/org/kaaproject/kaa/server/operations/service/logs/DefaultLogAppenderServiceTest.java b/server/node/src/test/java/org/kaaproject/kaa/server/operations/service/logs/DefaultLogAppenderServiceTest.java index 03fb55ec15..bf2256f87a 100644 --- a/server/node/src/test/java/org/kaaproject/kaa/server/operations/service/logs/DefaultLogAppenderServiceTest.java +++ b/server/node/src/test/java/org/kaaproject/kaa/server/operations/service/logs/DefaultLogAppenderServiceTest.java @@ -30,7 +30,7 @@ import org.kaaproject.kaa.server.appenders.mongo.appender.LogEventDao; import org.kaaproject.kaa.server.appenders.mongo.appender.MongoDbLogAppender; import org.kaaproject.kaa.server.common.dao.ApplicationService; -import org.kaaproject.kaa.server.common.dao.CTLService; +import org.kaaproject.kaa.server.common.dao.CtlService; import org.kaaproject.kaa.server.common.dao.LogAppendersService; import org.kaaproject.kaa.server.common.dao.LogSchemaService; import org.kaaproject.kaa.server.common.log.shared.appender.LogAppender; @@ -58,7 +58,7 @@ public class DefaultLogAppenderServiceTest { private ApplicationService applicationService; private LogSchemaService logSchemaService; private LogEventDao logEventDao; - private CTLService ctlService; + private CtlService ctlService; private LogAppendersService logAppendersService; @@ -73,7 +73,7 @@ public void beforeTest() throws IOException { logAppenderService = new DefaultLogAppenderService(); applicationService = mock(ApplicationService.class); logSchemaService = mock(LogSchemaService.class); - ctlService = mock(CTLService.class); + ctlService = mock(CtlService.class); logEventDao = mock(LogEventDao.class); logAppendersService = mock(LogAppendersService.class); diff --git a/server/node/src/test/java/org/kaaproject/kaa/server/operations/service/profile/ProfileServiceIT.java b/server/node/src/test/java/org/kaaproject/kaa/server/operations/service/profile/ProfileServiceIT.java index a5e92eb08f..1c33d5321a 100644 --- a/server/node/src/test/java/org/kaaproject/kaa/server/operations/service/profile/ProfileServiceIT.java +++ b/server/node/src/test/java/org/kaaproject/kaa/server/operations/service/profile/ProfileServiceIT.java @@ -36,7 +36,7 @@ import org.kaaproject.kaa.schema.system.EmptyData; import org.kaaproject.kaa.server.common.dao.AbstractTest; import org.kaaproject.kaa.server.common.dao.ApplicationService; -import org.kaaproject.kaa.server.common.dao.CTLService; +import org.kaaproject.kaa.server.common.dao.CtlService; import org.kaaproject.kaa.server.common.dao.SdkProfileService; import org.kaaproject.kaa.server.common.dao.UserService; import org.kaaproject.kaa.server.common.dao.model.sql.SdkProfile; @@ -87,7 +87,7 @@ public class ProfileServiceIT extends AbstractTest { @Autowired protected org.kaaproject.kaa.server.common.dao.ProfileService daoProfileService; @Autowired - protected CTLService ctlService; + protected CtlService ctlService; private String sdkToken; private String newSdkToken; private TenantDto tenant;