Skip to content

Commit 5cbdea1

Browse files
committed
Apply idea style
1 parent c7957dc commit 5cbdea1

File tree

2 files changed

+66
-31
lines changed

2 files changed

+66
-31
lines changed

modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java

Lines changed: 54 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -35,26 +35,35 @@
3535
* Deployment info bean.
3636
*/
3737
public class GridDeploymentInfoBean implements Message, GridDeploymentInfo, Externalizable {
38-
/** */
38+
/**
39+
*
40+
*/
3941
@Order(value = 0, method = "classLoaderId")
4042
private IgniteUuid clsLdrId;
4143

42-
/** */
44+
/**
45+
*
46+
*/
4347
@Order(value = 1, method = "deployMode")
4448
private DeploymentMode depMode;
4549

46-
47-
/** */
50+
/**
51+
*
52+
*/
4853
@Order(value = 2, method = "localDeploymentOwner")
4954
@Deprecated // Left for backward compatibility only.
5055
private boolean locDepOwner;
5156

52-
/** Node class loader participant map. */
57+
/**
58+
* Node class loader participant map.
59+
*/
5360
@GridToStringInclude
5461
@Order(3)
5562
private Map<UUID, IgniteUuid> participants;
5663

57-
/** */
64+
/**
65+
*
66+
*/
5867
@Order(value = 4, method = "userVersion")
5968
private String userVer;
6069

@@ -66,9 +75,9 @@ public GridDeploymentInfoBean() {
6675
}
6776

6877
/**
69-
* @param clsLdrId Class loader ID.
70-
* @param userVer User version.
71-
* @param depMode Deployment mode.
78+
* @param clsLdrId Class loader ID.
79+
* @param userVer User version.
80+
* @param depMode Deployment mode.
7281
* @param participants Participants.
7382
*/
7483
public GridDeploymentInfoBean(
@@ -93,7 +102,9 @@ public GridDeploymentInfoBean(GridDeploymentInfo dep) {
93102
participants = Map.copyOf(dep.participants());
94103
}
95104

96-
/** {@inheritDoc} */
105+
/**
106+
* {@inheritDoc}
107+
*/
97108
@Override public IgniteUuid classLoaderId() {
98109
return clsLdrId;
99110
}
@@ -105,7 +116,9 @@ public void classLoaderId(IgniteUuid clsLdrId) {
105116
this.clsLdrId = clsLdrId;
106117
}
107118

108-
/** {@inheritDoc} */
119+
/**
120+
* {@inheritDoc}
121+
*/
109122
@Override public DeploymentMode deployMode() {
110123
return depMode;
111124
}
@@ -117,7 +130,9 @@ public void deployMode(DeploymentMode depMode) {
117130
this.depMode = depMode;
118131
}
119132

120-
/** {@inheritDoc} */
133+
/**
134+
* {@inheritDoc}
135+
*/
121136
@Override public String userVersion() {
122137
return userVer;
123138
}
@@ -129,12 +144,16 @@ public void userVersion(String userVer) {
129144
this.userVer = userVer;
130145
}
131146

132-
/** {@inheritDoc} */
147+
/**
148+
* {@inheritDoc}
149+
*/
133150
@Override public long sequenceNumber() {
134151
return clsLdrId.localId();
135152
}
136153

137-
/** {@inheritDoc} */
154+
/**
155+
* {@inheritDoc}
156+
*/
138157
@Override public boolean localDeploymentOwner() {
139158
return locDepOwner;
140159
}
@@ -146,7 +165,9 @@ public void localDeploymentOwner(boolean locDepOwner) {
146165
this.locDepOwner = locDepOwner;
147166
}
148167

149-
/** {@inheritDoc} */
168+
/**
169+
* {@inheritDoc}
170+
*/
150171
@Override public Map<UUID, IgniteUuid> participants() {
151172
return participants;
152173
}
@@ -158,23 +179,31 @@ public void participants(Map<UUID, IgniteUuid> participants) {
158179
this.participants = participants;
159180
}
160181

161-
/** {@inheritDoc} */
182+
/**
183+
* {@inheritDoc}
184+
*/
162185
@Override public int hashCode() {
163186
return clsLdrId.hashCode();
164187
}
165188

166-
/** {@inheritDoc} */
189+
/**
190+
* {@inheritDoc}
191+
*/
167192
@Override public boolean equals(Object o) {
168193
return o == this || o instanceof GridDeploymentInfoBean &&
169194
clsLdrId.equals(((GridDeploymentInfoBean)o).clsLdrId);
170195
}
171196

172-
/** {@inheritDoc} */
197+
/**
198+
* {@inheritDoc}
199+
*/
173200
@Override public short directType() {
174201
return 10;
175202
}
176203

177-
/** {@inheritDoc} */
204+
/**
205+
* {@inheritDoc}
206+
*/
178207
@Override public void writeExternal(ObjectOutput out) throws IOException {
179208
U.writeIgniteUuid(out, clsLdrId);
180209
U.writeEnum(out, depMode);
@@ -183,7 +212,9 @@ public void participants(Map<UUID, IgniteUuid> participants) {
183212
U.writeMap(out, participants);
184213
}
185214

186-
/** {@inheritDoc} */
215+
/**
216+
* {@inheritDoc}
217+
*/
187218
@Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
188219
clsLdrId = U.readIgniteUuid(in);
189220
depMode = DeploymentMode.fromOrdinal(in.readByte());
@@ -192,7 +223,9 @@ public void participants(Map<UUID, IgniteUuid> participants) {
192223
participants = U.readMap(in);
193224
}
194225

195-
/** {@inheritDoc} */
226+
/**
227+
* {@inheritDoc}
228+
*/
196229
@Override public String toString() {
197230
return S.toString(GridDeploymentInfoBean.class, this);
198231
}

modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBeanTest.java

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,6 @@
1717

1818
package org.apache.ignite.internal.managers.deployment;
1919

20-
import static java.util.UUID.randomUUID;
21-
import static org.apache.ignite.lang.IgniteUuid.randomUuid;
22-
import static org.junit.Assert.assertEquals;
23-
import static org.junit.Assert.assertNotNull;
24-
import static org.junit.Assert.assertTrue;
25-
2620
import java.nio.ByteBuffer;
2721
import java.util.Map;
2822
import java.util.function.Function;
@@ -37,11 +31,19 @@
3731
import org.apache.ignite.plugin.extensions.communication.MessageSerializer;
3832
import org.junit.Test;
3933

34+
import static java.util.UUID.randomUUID;
35+
import static org.apache.ignite.lang.IgniteUuid.randomUuid;
36+
import static org.junit.Assert.assertEquals;
37+
import static org.junit.Assert.assertNotNull;
38+
import static org.junit.Assert.assertTrue;
39+
4040
/**
4141
* Tests for {@link GridDeploymentInfoBean} serialization.
4242
*/
4343
public class GridDeploymentInfoBeanTest {
44-
/** Message factory. */
44+
/**
45+
* Message factory.
46+
*/
4547
private final MessageFactory msgFactory =
4648
new IgniteMessageFactoryImpl(new MessageFactoryProvider[] {new GridIoMessageFactory()});
4749

@@ -76,7 +78,7 @@ public void testSerialization() {
7678

7779
/**
7880
* @param srcMsg Message to marshal.
79-
* @param <T> Message type.
81+
* @param <T> Message type.
8082
* @return Unmarshalled message.
8183
*/
8284
private <T extends Message> T doMarshalUnmarshal(T srcMsg) {
@@ -116,9 +118,9 @@ private <T extends Message> T doMarshalUnmarshal(T srcMsg) {
116118
}
117119

118120
/**
119-
* @param buf Byte buffer.
121+
* @param buf Byte buffer.
120122
* @param start Start position.
121-
* @param func Function that is sequentially executed on a different-sized part of the buffer.
123+
* @param func Function that is sequentially executed on a different-sized part of the buffer.
122124
* @return {@code True} if the function returns {@code True} at least once, {@code False} otherwise.
123125
*/
124126
private boolean loopBuffer(ByteBuffer buf, int start, Function<ByteBuffer, Boolean> func) {

0 commit comments

Comments
 (0)