From f773096ee94f0c6cf6df2deb86d4000c448aa46e Mon Sep 17 00:00:00 2001 From: Sasha Didukh Date: Thu, 29 Sep 2016 16:57:47 +0300 Subject: [PATCH] KAA-1279: Fixed about 100 warnings --- .../DefaultDeltaCalculationAlgorithm.java | 68 ++++++++++++------- .../communication/HttpLongPollParameters.java | 4 +- .../communication/HttpParameters.java | 4 +- .../{IPParameters.java => IpParameters.java} | 10 +-- .../communication/KaaTcpParameters.java | 2 +- .../channels/communication/package-info.java | 2 +- .../channels/protocols/kaatcp/Framer.java | 8 +-- .../kaatcp/KaaTcpProtocolException.java | 5 +- .../protocols/kaatcp/MqttFramelistener.java | 2 +- .../kaatcp/listeners/ConnAckListener.java | 2 +- .../kaatcp/listeners/ConnectListener.java | 2 +- .../kaatcp/listeners/DisconnectListener.java | 2 +- .../kaatcp/listeners/KaaSyncListener.java | 2 +- .../kaatcp/listeners/MessageListener.java | 2 +- .../kaatcp/listeners/PingRequestListener.java | 2 +- .../listeners/PingResponseListener.java | 2 +- .../kaatcp/listeners/SyncRequestListener.java | 2 +- .../listeners/SyncResponseListener.java | 2 +- .../protocols/kaatcp/messages/ConnAck.java | 13 ++-- .../protocols/kaatcp/messages/Connect.java | 13 ++-- .../protocols/kaatcp/messages/Disconnect.java | 17 ++--- .../protocols/kaatcp/messages/KaaSync.java | 31 +++++---- .../kaatcp/messages/KaaSyncMessageType.java | 2 +- .../kaatcp/messages/MessageFactory.java | 4 +- .../kaatcp/messages/PingRequest.java | 3 +- .../kaatcp/messages/PingResponse.java | 3 +- .../protocols/kaatcp/messages/Sync.java | 6 +- .../kaatcp/messages/SyncRequest.java | 2 + .../kaatcp/messages/SyncResponse.java | 2 + ...ametersTest.java => IpParametersTest.java} | 34 +++++----- 30 files changed, 138 insertions(+), 115 deletions(-) rename common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/communication/{IPParameters.java => IpParameters.java} (90%) rename common/endpoint-shared/src/test/java/org/kaaproject/kaa/common/channels/communication/{IPParametersTest.java => IpParametersTest.java} (70%) 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 e315c826a2..2f58900e59 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 @@ -86,8 +86,6 @@ public class DefaultDeltaCalculationAlgorithm implements DeltaCalculationAlgorit */ private AvroBinaryDelta resultDelta; - /* FieldAttribute */ - /** * Instantiates a new default delta calculator. * @@ -99,8 +97,6 @@ public DefaultDeltaCalculationAlgorithm(Schema deltaSchema, Schema baseSchema) { this.baseSchema = baseSchema; } - /* RecordTuple */ - /** * Gets the full name. * @@ -174,7 +170,8 @@ private static Schema getSchemaByFullName(Schema arraySchema, String fullName) { List itemTypes = arraySchema.getElementType().getTypes(); return getSchemaByFullName(itemTypes, fullName); } else { - return arraySchema.getElementType().getFullName().equals(fullName) ? arraySchema.getElementType() : null; + return arraySchema.getElementType().getFullName().equals( + fullName) ? arraySchema.getElementType() : null; } } @@ -185,8 +182,10 @@ private static Schema getSchemaByFullName(Schema arraySchema, String fullName) { * @param field the field * @throws DeltaCalculatorException the delta calculator exception */ - private static void putUnchanged(GenericRecord delta, String field) throws DeltaCalculatorException { - Schema unchangedSchema = getSchemaByFullName(delta, field, KAA_NAMESPACE + "." + UNCHANGED + "T"); + private static void putUnchanged(GenericRecord delta, String field) + throws DeltaCalculatorException { + Schema unchangedSchema = getSchemaByFullName( + delta, field, KAA_NAMESPACE + "." + UNCHANGED + "T"); if (unchangedSchema != null) { GenericEnumSymbol unchanged = new GenericData.EnumSymbol(unchangedSchema, UNCHANGED); delta.put(field, unchanged); @@ -210,8 +209,9 @@ private static void putReset(GenericRecord delta, String field) throws DeltaCalc GenericEnumSymbol reset = new GenericData.EnumSymbol(resetSchema, RESET); delta.put(field, reset); } else { - throw new DeltaCalculatorException(new StringBuilder().append("Failed to find schema for \"reset\" type ") - .append(" in ").append(delta.getSchema().getFullName()).append(" field ").append(field).toString()); + throw new DeltaCalculatorException(new StringBuilder().append( + "Failed to find schema for \"reset\" type ").append(" in ").append( + delta.getSchema().getFullName()).append(" field ").append(field).toString()); } } @@ -223,7 +223,8 @@ private static void putReset(GenericRecord delta, String field) throws DeltaCalc * @param record the record * @return the generic record */ - private static GenericRecord createSubDelta(GenericRecord delta, String field, GenericRecord record) { + private static GenericRecord createSubDelta( + GenericRecord delta, String field, GenericRecord record) { Schema recordType = getSchemaByFullName(delta, field, getFullName(record)); return recordType == null ? null : new GenericData.Record(recordType); } @@ -238,7 +239,9 @@ private static GenericRecord createSubDelta(GenericRecord delta, String field, G * @throws DeltaCalculatorException the delta calculator exception */ private static void fillDeltaArrayFields(GenericRecord delta, Set resetFields, - Map> uuidFields, Queue fieldQueue) throws DeltaCalculatorException { + Map> uuidFields, + Queue fieldQueue) + throws DeltaCalculatorException { List fields = delta.getSchema().getFields(); if (fieldQueue.isEmpty()) { @@ -299,7 +302,8 @@ private Schema getDeltaSchemaByFullName(String fullName) { * @param array the array * @throws DeltaCalculatorException the delta calculator exception */ - private void addComplexItemToArray(GenericContainer container, GenericArray array) throws DeltaCalculatorException { + private void addComplexItemToArray(GenericContainer container, GenericArray array) + throws DeltaCalculatorException { Schema itemSchema = getSchemaByFullName(array.getSchema(), getFullName(container)); if (itemSchema.getType() == Type.RECORD) { GenericRecord subDelta = new GenericData.Record(itemSchema); @@ -320,20 +324,23 @@ private void addComplexItemToArray(GenericContainer container, GenericArray arra * @param fieldQueue the field queue * @throws DeltaCalculatorException the delta calculator exception */ - private void processComplexField(GenericRecord delta, String field, GenericContainer newRecordValue, - GenericContainer oldRecordValue, Queue fieldQueue) throws DeltaCalculatorException { + private void processComplexField( + GenericRecord delta, String field, GenericContainer newRecordValue, + GenericContainer oldRecordValue, Queue fieldQueue) + throws DeltaCalculatorException { boolean fieldChanged = false; if (newRecordValue.getSchema().getType() == Type.RECORD) { GenericRecord subDelta = createSubDelta(delta, field, (GenericRecord) newRecordValue); if (subDelta != null) { boolean hasChanges = false; - if (oldRecordValue != null && oldRecordValue.getSchema().getFullName().equals(newRecordValue.getSchema().getFullName())) { + if (oldRecordValue != null && oldRecordValue.getSchema().getFullName().equals( + newRecordValue.getSchema().getFullName())) { FieldAttribute fieldPair = new FieldAttribute(getSchemaByFullName(delta, field, getFullName(newRecordValue)), field); Queue newFieldQueue = new LinkedList(fieldQueue); newFieldQueue.offer(fieldPair); - hasChanges = fillDelta(subDelta, (GenericRecord) oldRecordValue, (GenericRecord) newRecordValue, - newFieldQueue); + hasChanges = fillDelta(subDelta, (GenericRecord) oldRecordValue, + (GenericRecord) newRecordValue, newFieldQueue); } else { fillDeltaWithoutMerge(subDelta, (GenericRecord) newRecordValue); hasChanges = true; @@ -343,7 +350,8 @@ private void processComplexField(GenericRecord delta, String field, GenericConta fieldChanged = true; } } else { - throw new DeltaCalculatorException(new StringBuilder().append("Failed to find subdelta schema \"") + throw new DeltaCalculatorException( + new StringBuilder().append("Failed to find subdelta schema \"") .append(getFullName(newRecordValue)).append("\"").toString()); } } else if (oldRecordValue == null || field.equals(UUID_FIELD) @@ -363,7 +371,8 @@ private void processComplexField(GenericRecord delta, String field, GenericConta * @param root the root * @throws DeltaCalculatorException the delta calculator exception */ - private void fillDeltaWithoutMerge(GenericRecord delta, GenericRecord root) throws DeltaCalculatorException { + private void fillDeltaWithoutMerge(GenericRecord delta, GenericRecord root) + throws DeltaCalculatorException { Schema rootSchema = root.getSchema(); for (Field field : rootSchema.getFields()) { Object value = root.get(field.name()); @@ -425,7 +434,8 @@ private boolean fillDelta(GenericRecord delta, GenericRecord oldRoot, GenericRec if (!newArrayItems.isEmpty()) { if (newArrayItems.get(0) instanceof GenericRecord) { // Item is a complex type - if (oldArrayItems != null && !oldArrayItems.isEmpty() && oldArrayItems.get(0) instanceof GenericRecord) { + if (oldArrayItems != null && !oldArrayItems.isEmpty() + && oldArrayItems.get(0) instanceof GenericRecord) { for (Object oldItem : oldArrayItems) { GenericRecord oldItemRecord = (GenericRecord) oldItem; Schema oldItemSchema = oldItemRecord.getSchema(); @@ -513,7 +523,8 @@ private boolean fillDelta(GenericRecord delta, GenericRecord oldRoot, GenericRec } } } else if (oldArrayItems == null) { - delta.put(newField.name(), new GenericData.Array(0, getArraySchema(delta, newField.name()))); + delta.put(newField.name(), + new GenericData.Array(0, getArraySchema(delta, newField.name()))); hasChanges = true; } else if (!oldArrayItems.isEmpty()) { resetFields.add(newField.name()); @@ -533,7 +544,8 @@ private boolean fillDelta(GenericRecord delta, GenericRecord oldRoot, GenericRec } } else if (newValue instanceof GenericContainer) { GenericContainer newRecordValue = (GenericContainer) newValue; - GenericContainer oldRecordValue = (oldValue instanceof GenericContainer) ? (GenericContainer) oldValue : null; + GenericContainer oldRecordValue = + (oldValue instanceof GenericContainer) ? (GenericContainer) oldValue : null; processComplexField(delta, newField.name(), newRecordValue, oldRecordValue, fieldQueue); } else if ((newValue == null && oldValue != null) || (newValue != null && !newValue.equals(oldValue))) { @@ -598,7 +610,8 @@ private void processDifferences(GenericRecord oldRoot, GenericRecord newRoot) hasDifferences = !(oldArray.size() == newArray.size()); if (!hasDifferences) { - if (!newArray.isEmpty() && newArray.get(0) instanceof GenericRecord && oldArray.get(0) instanceof GenericRecord) { + if (!newArray.isEmpty() && newArray.get(0) instanceof GenericRecord + && oldArray.get(0) instanceof GenericRecord) { GenericRecord uuidCheckRecord = (GenericRecord) newArray.get(0); Schema uuidCheckSchema = uuidCheckRecord.getSchema(); if (uuidCheckSchema.getField(UUID_FIELD) != null) { @@ -647,7 +660,8 @@ private void processDifferences(GenericRecord oldRoot, GenericRecord newRoot) if (hasDifferences && !processedRecords.contains(lastUuidRecords)) { Schema deltaSubSchema = getDeltaSchemaByFullName(lastUuidRecordName); if (deltaSubSchema == null) { - throw new DeltaCalculatorException(new StringBuilder().append("Failed to find schema for \"") + throw new DeltaCalculatorException( + new StringBuilder().append("Failed to find schema for \"") .append(lastUuidRecordName).append("\"").toString()); } GenericRecord delta = new GenericData.Record(deltaSubSchema); @@ -675,12 +689,14 @@ public RawBinaryDelta calculate(BaseData endpointConfiguration, BaseData newConf } @Override - public RawBinaryDelta calculate(BaseData newConfigurationBody) throws IOException, DeltaCalculatorException { + public RawBinaryDelta calculate(BaseData newConfigurationBody) + throws IOException, DeltaCalculatorException { GenericRecord newRoot = getRootNode(newConfigurationBody, baseSchema); return calculate(newRoot); } - public RawBinaryDelta calculate(GenericRecord oldConfig, GenericRecord newConfig) throws DeltaCalculatorException { + public RawBinaryDelta calculate(GenericRecord oldConfig, GenericRecord newConfig) + throws DeltaCalculatorException { resultDelta = new AvroBinaryDelta(deltaSchema); processedRecords = new HashSet<>(); processDifferences(oldConfig, newConfig); diff --git a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/communication/HttpLongPollParameters.java b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/communication/HttpLongPollParameters.java index 763a5df951..45afcddbb7 100644 --- a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/communication/HttpLongPollParameters.java +++ b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/communication/HttpLongPollParameters.java @@ -17,8 +17,8 @@ package org.kaaproject.kaa.common.channels.communication; /** - * @author Andrey Panasenko + * @author Andrey Panasenko. */ -public class HttpLongPollParameters extends IPParameters { +public class HttpLongPollParameters extends IpParameters { } diff --git a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/communication/HttpParameters.java b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/communication/HttpParameters.java index 00bc191928..499334c9bf 100644 --- a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/communication/HttpParameters.java +++ b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/communication/HttpParameters.java @@ -17,7 +17,7 @@ package org.kaaproject.kaa.common.channels.communication; /** - * @author Andrey Panasenko + * @author Andrey Panasenko. */ -public class HttpParameters extends IPParameters { +public class HttpParameters extends IpParameters { } diff --git a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/communication/IPParameters.java b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/communication/IpParameters.java similarity index 90% rename from common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/communication/IPParameters.java rename to common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/communication/IpParameters.java index fe8835b036..a57fd3d27d 100644 --- a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/communication/IPParameters.java +++ b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/communication/IpParameters.java @@ -17,13 +17,13 @@ package org.kaaproject.kaa.common.channels.communication; /** - * IPParameters Class. - * Base type for IP oriented Channels - IPParameters consists + * IpParameters Class. + * Base type for IP oriented Channels - IpParameters consists * HostName String and Integer port * * @author Andrey Panasenko */ -public class IPParameters { +public class IpParameters { private String hostName; private int port; @@ -68,7 +68,7 @@ public void setPort(int port) { */ @Override public String toString() { - return "IPParameters [hostName=" + hostName + ", port=" + port + "]"; + return "IpParameters [hostName=" + hostName + ", port=" + port + "]"; } /* (non-Javadoc) @@ -97,7 +97,7 @@ public boolean equals(Object obj) { if (getClass() != obj.getClass()) { return false; } - IPParameters other = (IPParameters) obj; + IpParameters other = (IpParameters) obj; if (hostName == null) { if (other.hostName != null) { return false; diff --git a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/communication/KaaTcpParameters.java b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/communication/KaaTcpParameters.java index 15ce1c3f7c..0bcd322675 100644 --- a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/communication/KaaTcpParameters.java +++ b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/communication/KaaTcpParameters.java @@ -16,7 +16,7 @@ package org.kaaproject.kaa.common.channels.communication; -public class KaaTcpParameters extends IPParameters { +public class KaaTcpParameters extends IpParameters { } diff --git a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/communication/package-info.java b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/communication/package-info.java index b9833fbf66..6b3d0bf752 100644 --- a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/communication/package-info.java +++ b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/communication/package-info.java @@ -16,7 +16,7 @@ /** * Provides Communications parameters implementations for all types of Channels - * Base type for IP oriented Channels - IPParameters consists + * Base type for IP oriented Channels - IpParameters consists * HostName String and Integer port * * @author Andrey Panasenko diff --git a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/Framer.java b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/Framer.java index 5dd8009a25..5ae0be1bfc 100644 --- a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/Framer.java +++ b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/Framer.java @@ -44,12 +44,12 @@ public class Framer { .getLogger(Framer.class); /** - * Mqtt frame listeners list + * Mqtt frame listeners list. */ private final List listeners; /** - * Current processing frame + * Current processing frame. */ private MqttFrame currentFrame; @@ -108,7 +108,7 @@ public int pushBytes(byte[] bytes) throws KaaTcpProtocolException { } /** - * Notify all listeners on new Frame + * Notify all listeners on new Frame. */ private void callListeners(MqttFrame frame) { for (MqttFramelistener listener : listeners) { @@ -117,7 +117,7 @@ private void callListeners(MqttFrame frame) { } /** - * Creates specific Kaatcp message by MessageType + * Creates specific Kaatcp message by MessageType. * * @param type - MessageType of mqttFrame * @return mqttFrame diff --git a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/KaaTcpProtocolException.java b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/KaaTcpProtocolException.java index a4f612ffab..555aa8054a 100644 --- a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/KaaTcpProtocolException.java +++ b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/KaaTcpProtocolException.java @@ -24,13 +24,10 @@ */ public class KaaTcpProtocolException extends Exception { - /** - * - */ private static final long serialVersionUID = 4989380711384492851L; /** - * Default constructor with error message + * Default constructor with error message. * * @param string the string */ diff --git a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/MqttFramelistener.java b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/MqttFramelistener.java index 37d7be9aa7..62747b3e4b 100644 --- a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/MqttFramelistener.java +++ b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/MqttFramelistener.java @@ -19,7 +19,7 @@ import org.kaaproject.kaa.common.channels.protocols.kaatcp.messages.MqttFrame; /** - * @author Andrey Panasenko + * @author Andrey Panasenko. */ public interface MqttFramelistener { public void onMqttFrame(MqttFrame frame); diff --git a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/listeners/ConnAckListener.java b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/listeners/ConnAckListener.java index 51b09c14e5..8b9adba022 100644 --- a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/listeners/ConnAckListener.java +++ b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/listeners/ConnAckListener.java @@ -19,7 +19,7 @@ import org.kaaproject.kaa.common.channels.protocols.kaatcp.messages.ConnAck; /** - * @author Andrey Panasenko + * @author Andrey Panasenko. */ public interface ConnAckListener extends MessageListener { diff --git a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/listeners/ConnectListener.java b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/listeners/ConnectListener.java index 6c257a829c..177e0e20d4 100644 --- a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/listeners/ConnectListener.java +++ b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/listeners/ConnectListener.java @@ -19,7 +19,7 @@ import org.kaaproject.kaa.common.channels.protocols.kaatcp.messages.Connect; /** - * @author Andrey Panasenko + * @author Andrey Panasenko. */ public interface ConnectListener extends MessageListener { diff --git a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/listeners/DisconnectListener.java b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/listeners/DisconnectListener.java index 8f35bf7b59..101497f677 100644 --- a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/listeners/DisconnectListener.java +++ b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/listeners/DisconnectListener.java @@ -19,7 +19,7 @@ import org.kaaproject.kaa.common.channels.protocols.kaatcp.messages.Disconnect; /** - * @author Andrey Panasenko + * @author Andrey Panasenko. */ public interface DisconnectListener extends MessageListener { diff --git a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/listeners/KaaSyncListener.java b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/listeners/KaaSyncListener.java index da0f2fa077..064f88b5a7 100644 --- a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/listeners/KaaSyncListener.java +++ b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/listeners/KaaSyncListener.java @@ -19,7 +19,7 @@ import org.kaaproject.kaa.common.channels.protocols.kaatcp.messages.KaaSync; /** - * @author Andrey Panasenko + * @author Andrey Panasenko. */ public interface KaaSyncListener extends MessageListener { diff --git a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/listeners/MessageListener.java b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/listeners/MessageListener.java index 5b0add0c29..f28e77d53d 100644 --- a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/listeners/MessageListener.java +++ b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/listeners/MessageListener.java @@ -19,7 +19,7 @@ import org.kaaproject.kaa.common.channels.protocols.kaatcp.messages.MqttFrame; /** - * @author Andrey Panasenko + * @author Andrey Panasenko. */ public interface MessageListener { public void onMessage(T message); diff --git a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/listeners/PingRequestListener.java b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/listeners/PingRequestListener.java index cc26a3f088..88b956aff0 100644 --- a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/listeners/PingRequestListener.java +++ b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/listeners/PingRequestListener.java @@ -19,7 +19,7 @@ import org.kaaproject.kaa.common.channels.protocols.kaatcp.messages.PingRequest; /** - * @author Andrey Panasenko + * @author Andrey Panasenko. */ public interface PingRequestListener extends MessageListener { diff --git a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/listeners/PingResponseListener.java b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/listeners/PingResponseListener.java index cf0e6016b1..570d0507db 100644 --- a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/listeners/PingResponseListener.java +++ b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/listeners/PingResponseListener.java @@ -19,7 +19,7 @@ import org.kaaproject.kaa.common.channels.protocols.kaatcp.messages.PingResponse; /** - * @author Andrey Panasenko + * @author Andrey Panasenko. */ public interface PingResponseListener extends MessageListener { diff --git a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/listeners/SyncRequestListener.java b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/listeners/SyncRequestListener.java index 903bc17357..992bc0fb2f 100644 --- a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/listeners/SyncRequestListener.java +++ b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/listeners/SyncRequestListener.java @@ -19,7 +19,7 @@ import org.kaaproject.kaa.common.channels.protocols.kaatcp.messages.SyncRequest; /** - * @author Andrey Panasenko + * @author Andrey Panasenko. */ public interface SyncRequestListener extends MessageListener { diff --git a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/listeners/SyncResponseListener.java b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/listeners/SyncResponseListener.java index aafabb3fb3..b648d8c940 100644 --- a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/listeners/SyncResponseListener.java +++ b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/listeners/SyncResponseListener.java @@ -19,7 +19,7 @@ import org.kaaproject.kaa.common.channels.protocols.kaatcp.messages.SyncResponse; /** - * @author Andrey Panasenko + * @author Andrey Panasenko. */ public interface SyncResponseListener extends MessageListener { diff --git a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/messages/ConnAck.java b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/messages/ConnAck.java index c364459e04..f2339eb54c 100644 --- a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/messages/ConnAck.java +++ b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/messages/ConnAck.java @@ -40,7 +40,7 @@ public ConnAck(ReturnCode returnCode) { } /** - * + * Default constructor. */ public ConnAck() { super(); @@ -58,7 +58,7 @@ protected void pack() { } /** - * Return ConnAck return code + * Return ConnAck return code. * * @return byte returnCode */ @@ -67,7 +67,7 @@ public ReturnCode getReturnCode() { } /** - * Set ConnAck return code + * Set ConnAck return code. * * @param returnCode - ReturnCode */ @@ -101,7 +101,8 @@ protected void decode() { } /* (non-Javadoc) - * @see org.kaaproject.kaa.common.channels.protocols.kaatcp.messages.MqttFrame#isNeedCloseConnection() + * @see + * org.kaaproject.kaa.common.channels.protocols.kaatcp.messages.MqttFrame#isNeedCloseConnection() */ @Override public boolean isNeedCloseConnection() { @@ -109,7 +110,7 @@ public boolean isNeedCloseConnection() { } /** - * CONNACK return code enum + * CONNACK return code enum. * ACCEPTED 0x01 Connection Accepted * REFUSE_BAD_PROTOCOL 0x02 Connection Refused: unacceptable protocol version * REFUSE_ID_REJECT 0x03 Connection Refused: identifier rejected @@ -135,7 +136,7 @@ private ReturnCode(byte code) { } /** - * Return byte representation of ConnAck return code + * Return byte representation of ConnAck return code. * * @return byte returnCode */ 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 20e1f244d2..96f44fca50 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 @@ -29,7 +29,6 @@ * (0) Will RETAIN (0) Will QoS (00) Will flag (0) Clean Session (1) 0x02 - value Keep Alive timer * byte 11 Keep alive MSB (0) byte 12 Keep alive LSB (200) Keep Alive timer - default value 200 * seconds. - * * Payload: Session Key: AES Session encoding key (16 byte) - encrypted with the Operations server * RSA Public Key EndpointPublicKeyHash: SHA Hash of Endpoint Public Key (32 byte) Signature: RSA * signature (32 byte) signed with the Endpoint Private Key of Session key (16 byte) + @@ -49,7 +48,8 @@ public class Connect extends MqttFrame { public static final byte CONNECT_FIXED_HEADER_FLAG = 0x02; public static final byte CONNECT_SESSION_KEY_FLAGS = 0x11; public static final byte CONNECT_SIGNATURE_FLAGS = 0x01; - private static final byte[] FIXED_HEADER_CONST = new byte[]{0x00, 0x06, 'K', 'a', 'a', 't', 'c', 'p', + private static final byte[] FIXED_HEADER_CONST = new + byte[]{0x00, 0x06, 'K', 'a', 'a', 't', 'c', 'p', CONNECT_VERSION, CONNECT_FIXED_HEADER_FLAG}; @@ -92,7 +92,8 @@ public class Connect extends MqttFrame { * @param signature the byte[] of Signature of aesSessionKey and endpointPublicKeyHash, * length 32 byte. */ - public Connect(int keepAlive, int nextProtocolId, byte[] aesSessionKey, byte[] syncRequest, byte[] signature) { + public Connect(int keepAlive, int nextProtocolId, byte[] aesSessionKey, byte[] syncRequest, + byte[] signature) { setMessageType(MessageType.CONNECT); this.setKeepAlive(keepAlive); this.setNextProtocolId(nextProtocolId); @@ -109,7 +110,8 @@ public Connect(int keepAlive, int nextProtocolId, byte[] aesSessionKey, byte[] s if (syncRequest != null) { remainingLength += syncRequest.length; } - LOG.debug("Created Connect message: session key size = {}, signature size = {}, sync request size = {}", + LOG.debug("Created Connect message: session key size = {}, signature size = {}," + + " sync request size = {}", aesSessionKey != null ? aesSessionKey.length : "null", signature != null ? signature.length : "null", syncRequest != null ? syncRequest.length : "null"); @@ -330,7 +332,8 @@ private void decodeKeepAlive() { /* (non-Javadoc) - * @see org.kaaproject.kaa.common.channels.protocols.kaatcp.messages.MqttFrame#isNeedCloseConnection() + * @see + * org.kaaproject.kaa.common.channels.protocols.kaatcp.messages.MqttFrame#isNeedCloseConnection() */ @Override public boolean isNeedCloseConnection() { diff --git a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/messages/Disconnect.java b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/messages/Disconnect.java index e629508231..b6e0f4d736 100644 --- a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/messages/Disconnect.java +++ b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/messages/Disconnect.java @@ -51,7 +51,7 @@ public Disconnect() { } /** - * Return Disconnect reason + * Return Disconnect reason. * * @return byte reason */ @@ -60,7 +60,7 @@ public DisconnectReason getReason() { } /** - * Set Disconnect reason + * Set Disconnect reason. * * @param reason DisconnectReason */ @@ -93,7 +93,8 @@ protected void decode() throws KaaTcpProtocolException { } /* (non-Javadoc) - * @see org.kaaproject.kaa.common.channels.protocols.kaatcp.messages.MqttFrame#isNeedCloseConnection() + * @see + * org.kaaproject.kaa.common.channels.protocols.kaatcp.messages.MqttFrame#isNeedCloseConnection() */ @Override public boolean isNeedCloseConnection() { @@ -101,10 +102,10 @@ public boolean isNeedCloseConnection() { } /** - * DISCONNECT reason - * NONE 0x00 No error - * BAD_REQUEST 0x01 Client sent a corrupted data - * INTERNAL_ERROR 0x02 Internal error has been occurred + * DISCONNECT return code reason. + * NONE 0x00 No error + * BAD_REQUEST 0x01 Client sent a corrupted data + * INTERNAL_ERROR 0x02 Internal error has been occurred */ public enum DisconnectReason { NONE((byte) 0x00), @@ -119,7 +120,7 @@ private DisconnectReason(byte code) { } /** - * Return byte representation of ConnAck return code + * Return byte representation of ConnAck return code. * * @return byte returnCode */ diff --git a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/messages/KaaSync.java b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/messages/KaaSync.java index 90de0bc825..6b1d3c4fbf 100644 --- a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/messages/KaaSync.java +++ b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/messages/KaaSync.java @@ -52,32 +52,32 @@ public class KaaSync extends MqttFrame { public static final byte KAASYNC_ENCRYPTED_FLAG = 0x04; public static final byte KAASYNC_VERSION = 0x01; private static final int KAASYNC_MESSAGE_TYPE_SHIFT = 4; - private static final byte[] FIXED_HEADER_CONST = new byte[]{0x00, 0x06, 'K', 'a', 'a', 't', 'c', 'p', - KAASYNC_VERSION}; + private static final byte[] FIXED_HEADER_CONST = new + byte[]{0x00, 0x06, 'K', 'a', 'a', 't', 'c', 'p', KAASYNC_VERSION}; /** - * message id if used, default 0 + * message id if used, default 0. */ private int messageId = 0; /** - * Request/Response (bit 0) 1 - request, 0 - response + * Request/Response (bit 0) 1 - request, 0 - response. */ private boolean request = false; /** - * Zipped (bit 1) 1 - zepped, 0 - unzipped + * Zipped (bit 1) 1 - zepped, 0 - unzipped. */ private boolean zipped = false; /** - * Encrypted(bit 2) 1 - encrypted, 0 - unencrypted + * Encrypted(bit 2) 1 - encrypted, 0 - unencrypted. */ private boolean encrypted = false; /** - * KaaSync subcommand message type + * KaaSync subcommand message type. */ private KaaSyncMessageType kaaSyncMessageType = KaaSyncMessageType.UNUSED; @@ -120,14 +120,14 @@ public KaaSync() { /** - * Pack KaaSync variable header + * Pack KaaSync variable header. */ protected void packVeriableHeader() { buffer.put(FIXED_HEADER_CONST); - byte mId1 = (byte) (messageId & 0x0000FF00); - buffer.put(mId1); - byte mId2 = (byte) (messageId & 0x000000FF); - buffer.put(mId2); + byte modId1 = (byte) (messageId & 0x0000FF00); + buffer.put(modId1); + byte modId2 = (byte) (messageId & 0x000000FF); + buffer.put(modId2); byte flags = 0x00; if (isRequest()) { @@ -163,7 +163,7 @@ public void setMessageId(int messageId) { } /** - * Is avro object is SyncRequest + * Is avro object is SyncRequest. * * @return boolean request */ @@ -218,7 +218,7 @@ public void setEncrypted(boolean encrypted) { /** - * Decode KaaSync variable header + * Decode KaaSync variable header. * * @throws KaaTcpProtocolException - if protocol version missmatch */ @@ -314,7 +314,8 @@ public MqttFrame upgradeFrame() throws KaaTcpProtocolException { } /* (non-Javadoc) - * @see org.kaaproject.kaa.common.channels.protocols.kaatcp.messages.MqttFrame#isNeedCloseConnection() + * @see + * org.kaaproject.kaa.common.channels.protocols.kaatcp.messages.MqttFrame#isNeedCloseConnection() */ @Override public boolean isNeedCloseConnection() { diff --git a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/messages/KaaSyncMessageType.java b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/messages/KaaSyncMessageType.java index a47f26244b..a36e429c2d 100644 --- a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/messages/KaaSyncMessageType.java +++ b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/messages/KaaSyncMessageType.java @@ -17,7 +17,7 @@ package org.kaaproject.kaa.common.channels.protocols.kaatcp.messages; /** - * KAASYNC subcomand id table + * KAASYNC subcomand id table. * Mnemonic Enumeration Description * UNUSED 0 reserved value * SYNC 1 Sync request/response diff --git a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/messages/MessageFactory.java b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/messages/MessageFactory.java index 73ae0d9af2..c39227f414 100644 --- a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/messages/MessageFactory.java +++ b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/messages/MessageFactory.java @@ -29,11 +29,9 @@ /** * MessageFactory Class. Used to transform byte stream to specific protocol * messages. Typical use: - * * MessageFactory factory = new MessageFactory(); * factory.registerMessageListener(listener); * factory.getFramer().pushBytes(bytes); - * * Where listener instance of class which implements one of protocol message * listeners. and bytes - byte[] stream received from TCP/IP. * @@ -116,7 +114,7 @@ public void onMqttFrame(MqttFrame frame) { } /** - * Private message processor in case of Mqtt frame is KaaSync Message Type + * Private message processor in case of Mqtt frame is KaaSync Message Type. * * @param frame KaaSync object */ diff --git a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/messages/PingRequest.java b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/messages/PingRequest.java index e54c327ca2..3b01d22699 100644 --- a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/messages/PingRequest.java +++ b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/messages/PingRequest.java @@ -54,7 +54,8 @@ protected void decode() throws KaaTcpProtocolException { } /* (non-Javadoc) - * @see org.kaaproject.kaa.common.channels.protocols.kaatcp.messages.MqttFrame#isNeedCloseConnection() + * @see + * org.kaaproject.kaa.common.channels.protocols.kaatcp.messages.MqttFrame#isNeedCloseConnection() */ @Override public boolean isNeedCloseConnection() { diff --git a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/messages/PingResponse.java b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/messages/PingResponse.java index 583288b75c..8e06fbde3f 100644 --- a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/messages/PingResponse.java +++ b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/messages/PingResponse.java @@ -53,7 +53,8 @@ protected void decode() throws KaaTcpProtocolException { } /* (non-Javadoc) - * @see org.kaaproject.kaa.common.channels.protocols.kaatcp.messages.MqttFrame#isNeedCloseConnection() + * @see + * org.kaaproject.kaa.common.channels.protocols.kaatcp.messages.MqttFrame#isNeedCloseConnection() */ @Override public boolean isNeedCloseConnection() { diff --git a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/messages/Sync.java b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/messages/Sync.java index 3e4604a8b0..eb38643c8a 100644 --- a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/messages/Sync.java +++ b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/messages/Sync.java @@ -34,13 +34,13 @@ public class Sync extends KaaSync { /** - * Avro object byte representation + * Avro object byte representation. */ private byte[] avroObject; /** - * Constructor for migrating from KaaSync to specific SyncRequest or SyncResponse + * Constructor for migrating from KaaSync to specific SyncRequest or SyncResponse. * * @param old KaaSync object which used to create new */ @@ -71,7 +71,7 @@ public Sync() { } /** - * Decode Avro Object + * Decode Avro Object. */ protected void decodeAvroObject() { int avroObjectSize = buffer.capacity() - buffer.position(); diff --git a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/messages/SyncRequest.java b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/messages/SyncRequest.java index c496dc6cf6..448680f25b 100644 --- a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/messages/SyncRequest.java +++ b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/messages/SyncRequest.java @@ -27,6 +27,8 @@ public class SyncRequest extends Sync { /** + * Instantiates a new SyncRequest. + * * @param avroObject the avro object * @param isZipped the is zipped * @param isEcrypted the is ecrypted diff --git a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/messages/SyncResponse.java b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/messages/SyncResponse.java index 85be5061ac..dab2072baf 100644 --- a/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/messages/SyncResponse.java +++ b/common/endpoint-shared/src/main/java/org/kaaproject/kaa/common/channels/protocols/kaatcp/messages/SyncResponse.java @@ -27,6 +27,8 @@ public class SyncResponse extends Sync { /** + * Instantiates a new SyncResponse. + * * @param avroObject the avro object * @param isZipped the is zipped * @param isEcrypted the is ecrypted diff --git a/common/endpoint-shared/src/test/java/org/kaaproject/kaa/common/channels/communication/IPParametersTest.java b/common/endpoint-shared/src/test/java/org/kaaproject/kaa/common/channels/communication/IpParametersTest.java similarity index 70% rename from common/endpoint-shared/src/test/java/org/kaaproject/kaa/common/channels/communication/IPParametersTest.java rename to common/endpoint-shared/src/test/java/org/kaaproject/kaa/common/channels/communication/IpParametersTest.java index cc70d56006..e5c3daac0d 100644 --- a/common/endpoint-shared/src/test/java/org/kaaproject/kaa/common/channels/communication/IPParametersTest.java +++ b/common/endpoint-shared/src/test/java/org/kaaproject/kaa/common/channels/communication/IpParametersTest.java @@ -25,66 +25,66 @@ /** * @author Andrey Panasenko */ -public class IPParametersTest { +public class IpParametersTest { /** - * Test method for {@link org.kaaproject.kaa.common.channels.communication.IPParameters#hashCode()}. + * Test method for {@link IpParameters#hashCode()}. */ @Test public void testHashCode() { - IPParameters p1 = new IPParameters(); - IPParameters p2 = new IPParameters(); + IpParameters p1 = new IpParameters(); + IpParameters p2 = new IpParameters(); p1.setHostName("host1"); p2.setHostName("host1"); p1.setPort(10); p2.setPort(10); assertEquals(p1.hashCode(), p2.hashCode()); - IPParameters p3 = new IPParameters(); + IpParameters p3 = new IpParameters(); p3.setPort(10); assertNotEquals(p1.hashCode(), p3.hashCode()); assertNotEquals(p2.hashCode(), p3.hashCode()); } /** - * Test method for {@link org.kaaproject.kaa.common.channels.communication.IPParameters#getHostName()}. + * Test method for {@link IpParameters#getHostName()}. */ @Test public void testGetHostName() { - IPParameters p1 = new IPParameters(); + IpParameters p1 = new IpParameters(); p1.setHostName("host1"); assertEquals("host1", p1.getHostName()); } /** - * Test method for {@link org.kaaproject.kaa.common.channels.communication.IPParameters#getPort()}. + * Test method for {@link IpParameters#getPort()}. */ @Test public void testGetPort() { - IPParameters p1 = new IPParameters(); + IpParameters p1 = new IpParameters(); p1.setPort(100); assertEquals(100, p1.getPort()); } /** - * Test method for {@link org.kaaproject.kaa.common.channels.communication.IPParameters#toString()}. + * Test method for {@link IpParameters#toString()}. */ @Test public void testToString() { - IPParameters p1 = new IPParameters(); + IpParameters p1 = new IpParameters(); p1.setHostName("host1"); p1.setPort(100); - assertEquals("IPParameters [hostName=host1, port=100]", p1.toString()); + assertEquals("IpParameters [hostName=host1, port=100]", p1.toString()); } /** - * Test method for {@link org.kaaproject.kaa.common.channels.communication.IPParameters#equals(java.lang.Object)}. + * Test method for {@link IpParameters#equals(java.lang.Object)}. */ @Test public void testEqualsObject() { - IPParameters p1 = new IPParameters(); - IPParameters p2 = new IPParameters(); + IpParameters p1 = new IpParameters(); + IpParameters p2 = new IpParameters(); p1.setHostName("host1"); p2.setHostName("host1"); p1.setPort(10); @@ -101,8 +101,8 @@ public void testEqualsObject() { if (p1.equals(new Object())) { fail("TestEquals to Object() objects failed"); } - IPParameters p3 = new IPParameters(); - IPParameters p4 = new IPParameters(); + IpParameters p3 = new IpParameters(); + IpParameters p4 = new IpParameters(); if (p3.equals(p1)) { fail("TestEquals to not equals objects failed"); }