Skip to content

Commit 2111ce3

Browse files
arifBurakDemirayarifBurakDemiray
authored
[Java] Add underscore to the numerics #Codacy (#243)
* feat: add underscore to numerics * revert: BackendModeTests.java * fix: tests
1 parent 4f562cc commit 2111ce3

File tree

11 files changed

+33
-33
lines changed

11 files changed

+33
-33
lines changed

‎app-java/src/main/java/ly/count/java/demo/BackendModeExample.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ private static void recordView() {
3737
segmentation.put("segment", "Windows");
3838
segmentation.put("start", "1");
3939

40-
Countly.instance().backendM().recordView(DEVICE_ID, "SampleView", segmentation, 1646640780130L);
40+
Countly.instance().backendM().recordView(DEVICE_ID, "SampleView", segmentation, 1_646_640_780_130L);
4141
}
4242

4343
private static void recordEvent() {
@@ -298,7 +298,7 @@ public static void main(String[] args) throws Exception {
298298
Config config = new Config(COUNTLY_SERVER_URL, COUNTLY_APP_KEY)
299299
.setLoggingLevel(Config.LoggingLevel.DEBUG)
300300
.enableBackendMode()
301-
.setRequestQueueMaxSize(10000)
301+
.setRequestQueueMaxSize(10_000)
302302
.setDeviceIdStrategy(Config.DeviceIdStrategy.UUID)
303303
.setRequiresConsent(false)
304304
.setEventQueueSizeToSend(1000);

‎app-java/src/main/java/ly/count/java/demo/BackendModePerformanceTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ private static void initSDK(int eventQueueSize, int requestQueueSize) {
4040

4141
static void performLargeRequestQueueSizeTest() {
4242
DemoUtils.println("===== Test Started: 'Large request queue size' =====");
43-
int requestQSize = 1000000;
43+
int requestQSize = 1_000_000;
4444
DemoUtils.printf("Before SDK Initialization: Total Memory = %dMb, Available RAM = %dMb %n", Device.dev.getRAMTotal(), Device.dev.getRAMAvailable());
4545
initSDK(1, requestQSize);
4646
DemoUtils.printf("After SDK Initialization: Total Memory = %d Mb, Available RAM= %d Mb %n", Device.dev.getRAMTotal(), Device.dev.getRAMAvailable());
@@ -121,7 +121,7 @@ static void performLargeEventQueueTest() {
121121
DemoUtils.printf("After SDK Initialization: Total Memory = %d Mb, Available RAM= %d Mb %n", Device.dev.getRAMTotal(), Device.dev.getRAMAvailable());
122122
int noOfDevices = 10;
123123
for (int d = 0; d <= noOfDevices; ++d) {
124-
DemoUtils.printf("Adding %d events into event Queue against deviceID = %s%n", 1_000_00, "device-id-" + d);
124+
DemoUtils.printf("Adding %d events into event Queue against deviceID = %s%n", 100_000, "device-id-" + d);
125125
for (int i = 1; i <= noOfEvents; ++i) {
126126

127127
Map<String, Object> segment = new ConcurrentHashMap<>();

‎sdk-java/src/main/java/ly/count/sdk/java/internal/Device.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ public void setLog(Log L) {
4444
/**
4545
* One second in nanoseconds
4646
*/
47-
protected static final Double NS_IN_SECOND = 1000000000.0d;
48-
protected static final Double NS_IN_MS = 1000000.0d;
47+
protected static final Double NS_IN_SECOND = 1_000_000_000.0d;
48+
protected static final Double NS_IN_MS = 1_000_000.0d;
4949
protected static final Double MS_IN_SECOND = 1000d;
5050
protected static final Long BYTES_IN_MB = 1024L * 1024;
5151

@@ -74,7 +74,7 @@ public String getOSVersion() {
7474
* @return timezone offset in seconds
7575
*/
7676
public int getTimezoneOffset() {
77-
return TimeZone.getDefault().getOffset(new Date().getTime()) / 60000;
77+
return TimeZone.getDefault().getOffset(new Date().getTime()) / 60_000;
7878
}
7979

8080
/**

‎sdk-java/src/main/java/ly/count/sdk/java/internal/TimeUtils.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
public class TimeUtils {
66

7-
protected static final Double NS_IN_SECOND = 1000000000.0d;
8-
protected static final Double NS_IN_MS = 1000000.0d;
7+
protected static final Double NS_IN_SECOND = 1_000_000_000.0d;
8+
protected static final Double NS_IN_MS = 1_000_000.0d;
99
protected static final long MS_IN_SECOND = 1000;
1010
private static final UniqueTimeGenerator uniqueTimer = new UniqueTimeGenerator();
1111

@@ -39,7 +39,7 @@ protected static Instant getCurrentInstant(long timestamp) {
3939
return new Instant(timestamp,
4040
calendar.get(Calendar.HOUR_OF_DAY),
4141
calendar.get(Calendar.DAY_OF_WEEK) - 1, // Calendar days are 1-based, Countly days are 0-based
42-
calendar.get(Calendar.ZONE_OFFSET) / 60000); //convert it to seconds
42+
calendar.get(Calendar.ZONE_OFFSET) / 60_000); //convert it to seconds
4343
}
4444

4545
/**

‎sdk-java/src/test/java/ly/count/sdk/java/internal/BackendModeTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -954,4 +954,4 @@ private int getHourFromTimeStamp(long timeStamp) {
954954

955955
return calendar.get(Calendar.HOUR_OF_DAY);
956956
}
957-
}
957+
}

‎sdk-java/src/test/java/ly/count/sdk/java/internal/EventImplTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ public void validateFromJson_toJson_segmentation() {
211211
segmentation.put("quantity", 3);
212212
segmentation.put("name", "test");
213213
segmentation.put("null", null);
214-
segmentation.put("checksum", 56476587L);
214+
segmentation.put("checksum", 56_476_587L);
215215
segmentation.put("divisor", 0.2f);
216216
event.segmentation = segmentation;
217217

@@ -220,7 +220,7 @@ public void validateFromJson_toJson_segmentation() {
220220
expectedSegmentation.put("price", BigDecimal.valueOf(9.43));
221221
expectedSegmentation.put("quantity", 3);
222222
expectedSegmentation.put("name", "test");
223-
expectedSegmentation.put("checksum", 56476587);
223+
expectedSegmentation.put("checksum", 56_476_587);
224224
expectedSegmentation.put("divisor", BigDecimal.valueOf(0.2));
225225

226226
JSONObject json = new JSONObject();

‎sdk-java/src/test/java/ly/count/sdk/java/internal/ModuleViewsTests.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ public void mixedTestFlow1() throws InterruptedException {
260260
Countly.instance().init(TestUtils.getConfigViews());
261261
TestUtils.validateEQSize(0);
262262

263-
Map<String, Object> customSegmentationA = TestUtils.map("money", 238746798234739L, "start", "1", "visit", "1", "name", TestUtils.keysValues[0], "segment", TestUtils.keysValues[1]);
263+
Map<String, Object> customSegmentationA = TestUtils.map("money", 238_746_798_234_739L, "start", "1", "visit", "1", "name", TestUtils.keysValues[0], "segment", TestUtils.keysValues[1]);
264264
Map<String, Object> customSegmentationB = TestUtils.map("gone_to", "Wall Sina", "map", TestUtils.map("titan", true, "level", 65));
265265

266266
Countly.instance().views().startView("A", customSegmentationA);
@@ -270,7 +270,7 @@ public void mixedTestFlow1() throws InterruptedException {
270270

271271
TestUtils.validateEQSize(4);
272272

273-
validateView("A", 0.0, 0, 4, true, true, TestUtils.map("money", 238746798234739L), "idv1", ""); // starting
273+
validateView("A", 0.0, 0, 4, true, true, TestUtils.map("money", 238_746_798_234_739L), "idv1", ""); // starting
274274
validateView("AutoStopped", 0.0, 1, 4, false, true, TestUtils.map("gone_to", "Wall Sina"), "idv2", "idv1"); // starting
275275
validateView("AutoStopped", 1.0, 2, 4, false, false, null, "idv2", "idv1"); // closing
276276
validateView("B", 0.0, 3, 4, false, true, null, "idv3", "idv2"); // starting
@@ -376,7 +376,7 @@ public void validateSegmentation2() {
376376
validateView("A", 0.0, 0, 2, true, true, null, "idv1", "");
377377
validateView("B", 0.0, 1, 2, false, true, null, "idv2", "idv1");
378378

379-
Map<String, Object> allSegmentation = TestUtils.map("Copyright", "Countly", "AppExit", true, "DestroyToken", false, "ExitedAt", 1702975890000L);
379+
Map<String, Object> allSegmentation = TestUtils.map("Copyright", "Countly", "AppExit", true, "DestroyToken", false, "ExitedAt", 1_702_975_890_000L);
380380
Countly.instance().views().stopAllViews(allSegmentation);
381381

382382
validateView("A", 0.0, 2, 4, false, false, allSegmentation, "idv1", "idv1");
@@ -401,9 +401,9 @@ public void validateSegmentation_internalKeys() {
401401
Map<String, Object> internalKeysSegmentation = TestUtils.map("start", "YES", "name", TestUtils.keysValues[0], "visit", "YES", "segment", TestUtils.keysValues[1]);
402402

403403
Countly.instance().views().startView("A", TestUtils.map(internalKeysSegmentation, "ultimate", "YES"));
404-
Countly.instance().views().stopViewWithName("A", TestUtils.map(internalKeysSegmentation, "end", "Unfortunately", "time", 1234567890L));
404+
Countly.instance().views().stopViewWithName("A", TestUtils.map(internalKeysSegmentation, "end", "Unfortunately", "time", 1_234_567_890L));
405405
validateView("A", 0.0, 0, 2, true, true, TestUtils.map("ultimate", "YES"), "idv1", "");
406-
validateView("A", 0.0, 1, 2, false, false, TestUtils.map("end", "Unfortunately", "time", 1234567890), "idv1", "");
406+
validateView("A", 0.0, 1, 2, false, false, TestUtils.map("end", "Unfortunately", "time", 1_234_567_890), "idv1", "");
407407
}
408408

409409
/**

‎sdk-java/src/test/java/ly/count/sdk/java/internal/SessionImplTests.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public void stop() {
4141
@Test
4242
public void constructor() {
4343
Countly.instance().init(TestUtils.getConfigSessions());
44-
assertEquals(new Long(12345L), createSessionImpl(12345L).getId());
44+
assertEquals(new Long(12_345L), createSessionImpl(12_345L).getId());
4545
}
4646

4747
/**
@@ -488,7 +488,7 @@ private void addCrashReport_base(Config config, int rqSize) {
488488
@Test
489489
public void hashCode_id() {
490490
Countly.instance().init(TestUtils.getConfigSessions());
491-
assertEquals(new Long(12345L).hashCode(), createSessionImpl(12345L).hashCode());
491+
assertEquals(new Long(12_345L).hashCode(), createSessionImpl(12_345L).hashCode());
492492
}
493493

494494
/**
@@ -521,7 +521,7 @@ public void equals_test() {
521521
@Test
522522
public void equals_notInstanceOf() {
523523
Countly.instance().init(TestUtils.getConfigSessions());
524-
Assert.assertFalse(createSessionImpl(12345L).equals(new Object()));
524+
Assert.assertFalse(createSessionImpl(12_345L).equals(new Object()));
525525
}
526526

527527
/**
@@ -632,8 +632,8 @@ public void view_stopStartedAndNext() {
632632
private void validateNotEquals(int idOffset, BiFunction<SessionImpl, SessionImpl, Consumer<Long>> setter) {
633633
Countly.instance().init(TestUtils.getConfigSessions());
634634
long ts = TimeUtils.timestampMs();
635-
SessionImpl session = createSessionImpl(12345L);
636-
SessionImpl session2 = createSessionImpl(12345L + idOffset);
635+
SessionImpl session = createSessionImpl(12_345L);
636+
SessionImpl session2 = createSessionImpl(12_345L + idOffset);
637637
setter.apply(session, session).accept(ts);
638638
Assert.assertFalse(session.equals(session2));
639639
}

‎sdk-java/src/test/java/ly/count/sdk/java/internal/TimeGeneratorTests.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public void testAsIs() {
1010

1111
long last = simulator.timestamp();
1212

13-
for (int i = 0; i < 10000; i++) {
13+
for (int i = 0; i < 10_000; i++) {
1414
long next = simulator.timestamp();
1515
Assert.assertNotSame(last, next);
1616
}
@@ -27,7 +27,7 @@ public void testMidTimeChange() {
2727
Assert.assertNotSame(last, next);
2828
}
2929

30-
simulator.addition = -10000;
30+
simulator.addition = -10_000;
3131

3232
for (int i = 0; i < 100; i++) {
3333
long next = simulator.timestamp();
@@ -41,7 +41,7 @@ public void testMidTimeChange() {
4141
Assert.assertNotSame(last, next);
4242
}
4343

44-
simulator.addition = 10000;
44+
simulator.addition = 10_000;
4545

4646
for (int i = 0; i < 100; i++) {
4747
long next = simulator.timestamp();
@@ -55,17 +55,17 @@ public void testMidTimeRandomChange() {
5555

5656
long last = simulator.timestamp();
5757

58-
for (int i = 0; i < 100000; i++) {
58+
for (int i = 0; i < 100_000; i++) {
5959
if (i % 30 == 0) {
60-
simulator.addition = Math.round(Math.random() * 10000 - 5000);
60+
simulator.addition = Math.round(Math.random() * 10_000 - 5000);
6161
}
6262
long next = simulator.timestamp();
6363
Assert.assertNotSame(last, next);
6464
}
6565

6666
simulator.addition = 0;
6767

68-
for (int i = 0; i < 100000; i++) {
68+
for (int i = 0; i < 100_000; i++) {
6969
if (i % 30 == 0) {
7070
simulator.addition += Math.round(Math.random() * 1000 - 500);
7171
}

‎sdk-java/src/test/java/ly/count/sdk/java/internal/TimeUtilsTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public void uniqueTimestamp() {
4545
*/
4646
@Test
4747
public void nsToMs() {
48-
Assert.assertEquals(1, TimeUtils.nsToMs(1000000));
48+
Assert.assertEquals(1, TimeUtils.nsToMs(1_000_000));
4949
}
5050

5151
/**
@@ -54,7 +54,7 @@ public void nsToMs() {
5454
*/
5555
@Test
5656
public void nsToSec() {
57-
Assert.assertEquals(1, TimeUtils.nsToSec(1000000000));
57+
Assert.assertEquals(1, TimeUtils.nsToSec(1_000_000_000));
5858
}
5959

6060
/**
@@ -72,6 +72,6 @@ public void secToMs() {
7272
*/
7373
@Test
7474
public void secToNs() {
75-
Assert.assertEquals(1000000000, TimeUtils.secToNs(1));
75+
Assert.assertEquals(1_000_000_000, TimeUtils.secToNs(1));
7676
}
7777
}

0 commit comments

Comments
 (0)