Skip to content

Commit d28a52e

Browse files
jaboehrijaboehri
committed
Removed NetworkSpeedCalculator because enums are already able to calculate the speed themselves
1 parent 6bfd6eb commit d28a52e

File tree

5 files changed

+36
-32
lines changed

5 files changed

+36
-32
lines changed

‎src/main/java/dev/dsf/bpe/CodeSystem.java‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,10 @@ public enum Code
221221
@Override
222222
public BigDecimal calculateSpeed(long bytes, Duration duration)
223223
{
224+
if (bytes == 0)
225+
return BigDecimal.ZERO;
226+
if (duration.isZero())
227+
return BigDecimal.valueOf(Long.MAX_VALUE);
224228
BigDecimal bits = BigDecimal.valueOf(bytes * 8L).setScale(2, RoundingMode.HALF_UP);
225229
BigDecimal seconds = BigDecimal.valueOf(duration.toMillis()).setScale(3, RoundingMode.HALF_UP)
226230
.divide(BigDecimal.valueOf(1000).setScale(3, RoundingMode.HALF_UP), RoundingMode.HALF_UP);
@@ -232,6 +236,10 @@ public BigDecimal calculateSpeed(long bytes, Duration duration)
232236
@Override
233237
public BigDecimal calculateSpeed(long bytes, Duration duration)
234238
{
239+
if (bytes == 0)
240+
return BigDecimal.ZERO;
241+
if (duration.isZero())
242+
return BigDecimal.valueOf(Long.MAX_VALUE);
235243
BigDecimal kiloBits = BigDecimal.valueOf(bytes * 8L).setScale(2, RoundingMode.HALF_UP)
236244
.divide(BigDecimal.valueOf(1000), RoundingMode.HALF_UP);
237245
BigDecimal seconds = BigDecimal.valueOf(duration.toMillis()).setScale(3, RoundingMode.HALF_UP)
@@ -244,6 +252,10 @@ public BigDecimal calculateSpeed(long bytes, Duration duration)
244252
@Override
245253
public BigDecimal calculateSpeed(long bytes, Duration duration)
246254
{
255+
if (bytes == 0)
256+
return BigDecimal.ZERO;
257+
if (duration.isZero())
258+
return BigDecimal.valueOf(Long.MAX_VALUE);
247259
BigDecimal kiloBits = BigDecimal.valueOf(bytes * 8L).setScale(2, RoundingMode.HALF_UP)
248260
.divide(BigDecimal.valueOf(1000000), RoundingMode.HALF_UP);
249261
BigDecimal seconds = BigDecimal.valueOf(duration.toMillis()).setScale(3, RoundingMode.HALF_UP)
@@ -256,6 +268,10 @@ public BigDecimal calculateSpeed(long bytes, Duration duration)
256268
@Override
257269
public BigDecimal calculateSpeed(long bytes, Duration duration)
258270
{
271+
if (bytes == 0)
272+
return BigDecimal.ZERO;
273+
if (duration.isZero())
274+
return BigDecimal.valueOf(Long.MAX_VALUE);
259275
BigDecimal kiloBits = BigDecimal.valueOf(bytes * 8L).setScale(2, RoundingMode.HALF_UP)
260276
.divide(BigDecimal.valueOf(1000000000), RoundingMode.HALF_UP);
261277
BigDecimal seconds = BigDecimal.valueOf(duration.toMillis()).setScale(3, RoundingMode.HALF_UP)
@@ -268,6 +284,10 @@ public BigDecimal calculateSpeed(long bytes, Duration duration)
268284
@Override
269285
public BigDecimal calculateSpeed(long bytes, Duration duration)
270286
{
287+
if (bytes == 0)
288+
return BigDecimal.ZERO;
289+
if (duration.isZero())
290+
return BigDecimal.valueOf(Long.MAX_VALUE);
271291
BigDecimal kiloBits = BigDecimal.valueOf(bytes).setScale(2, RoundingMode.HALF_UP);
272292
BigDecimal seconds = BigDecimal.valueOf(duration.toMillis()).setScale(3, RoundingMode.HALF_UP)
273293
.divide(BigDecimal.valueOf(1000).setScale(3, RoundingMode.HALF_UP), RoundingMode.HALF_UP);
@@ -279,6 +299,10 @@ public BigDecimal calculateSpeed(long bytes, Duration duration)
279299
@Override
280300
public BigDecimal calculateSpeed(long bytes, Duration duration)
281301
{
302+
if (bytes == 0)
303+
return BigDecimal.ZERO;
304+
if (duration.isZero())
305+
return BigDecimal.valueOf(Long.MAX_VALUE);
282306
BigDecimal kiloBits = BigDecimal.valueOf(bytes).setScale(2, RoundingMode.HALF_UP)
283307
.divide(BigDecimal.valueOf(1000), RoundingMode.HALF_UP);
284308
BigDecimal seconds = BigDecimal.valueOf(duration.toMillis()).setScale(3, RoundingMode.HALF_UP)
@@ -291,6 +315,10 @@ public BigDecimal calculateSpeed(long bytes, Duration duration)
291315
@Override
292316
public BigDecimal calculateSpeed(long bytes, Duration duration)
293317
{
318+
if (bytes == 0)
319+
return BigDecimal.ZERO;
320+
if (duration.isZero())
321+
return BigDecimal.valueOf(Long.MAX_VALUE);
294322
BigDecimal kiloBits = BigDecimal.valueOf(bytes).setScale(2, RoundingMode.HALF_UP)
295323
.divide(BigDecimal.valueOf(1000000), RoundingMode.HALF_UP);
296324
BigDecimal seconds = BigDecimal.valueOf(duration.toMillis()).setScale(3, RoundingMode.HALF_UP)
@@ -303,6 +331,10 @@ public BigDecimal calculateSpeed(long bytes, Duration duration)
303331
@Override
304332
public BigDecimal calculateSpeed(long bytes, Duration duration)
305333
{
334+
if (bytes == 0)
335+
return BigDecimal.ZERO;
336+
if (duration.isZero())
337+
return BigDecimal.valueOf(Long.MAX_VALUE);
306338
BigDecimal kiloBits = BigDecimal.valueOf(bytes).setScale(2, RoundingMode.HALF_UP)
307339
.divide(BigDecimal.valueOf(1000000000), RoundingMode.HALF_UP);
308340
BigDecimal seconds = BigDecimal.valueOf(duration.toMillis()).setScale(3, RoundingMode.HALF_UP)

‎src/main/java/dev/dsf/bpe/service/ping/StoreResults.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import dev.dsf.bpe.ProcessErrors;
2222
import dev.dsf.bpe.mail.AggregateErrorMailService;
2323
import dev.dsf.bpe.util.ErrorListUtils;
24-
import dev.dsf.bpe.util.task.NetworkSpeedCalculator;
2524
import dev.dsf.bpe.util.task.output.generator.PingStatusGenerator;
2625
import dev.dsf.bpe.v1.ProcessPluginApi;
2726
import dev.dsf.bpe.v1.activity.AbstractServiceDelegate;
@@ -79,7 +78,7 @@ protected void doExecute(DelegateExecution execution, Variables variables) throw
7978
.getVariable(ExecutionVariables.DOWNLOADED_DURATION.correlatedValue(correlationKey));
8079

8180
BigDecimal downloadSpeed = downloadedBytes != null && downloadedDuration != null
82-
? NetworkSpeedCalculator.calculate(downloadedBytes, downloadedDuration, networkSpeedUnit)
81+
? networkSpeedUnit.calculateSpeed(downloadedBytes, downloadedDuration)
8382
: null;
8483

8584
Long uploadedBytes = variables
@@ -88,7 +87,7 @@ protected void doExecute(DelegateExecution execution, Variables variables) throw
8887
.getVariable(ExecutionVariables.UPLOADED_DURATION.correlatedValue(correlationKey));
8988

9089
BigDecimal uploadSpeed = uploadedBytes != null && uploadedDurationMillis != null
91-
? NetworkSpeedCalculator.calculate(uploadedBytes, uploadedDurationMillis, networkSpeedUnit)
90+
? networkSpeedUnit.calculateSpeed(uploadedBytes, uploadedDurationMillis)
9291
: null;
9392

9493
task.addOutput(PingStatusGenerator.createPingStatusOutput(target, statusCode, errors.getEntries(),

‎src/main/java/dev/dsf/bpe/service/pong/StoreDownloadSpeed.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
import dev.dsf.bpe.CodeSystem;
1313
import dev.dsf.bpe.ExecutionVariables;
14-
import dev.dsf.bpe.util.task.NetworkSpeedCalculator;
1514
import dev.dsf.bpe.util.task.output.generator.PingStatusGenerator;
1615
import dev.dsf.bpe.v1.ProcessPluginApi;
1716
import dev.dsf.bpe.v1.activity.AbstractServiceDelegate;
@@ -38,8 +37,7 @@ protected void doExecute(DelegateExecution execution, Variables variables) throw
3837
Duration downloadedDuration = (Duration) variables
3938
.getVariable(ExecutionVariables.DOWNLOADED_DURATION.getValue());
4039

41-
BigDecimal downloadSpeed = NetworkSpeedCalculator.calculate(downloadedBytes, downloadedDuration,
42-
networkSpeedUnit);
40+
BigDecimal downloadSpeed = networkSpeedUnit.calculateSpeed(downloadedBytes, downloadedDuration);
4341

4442
PingStatusGenerator.updatePongStatusOutput(startTask, CodeSystem.DsfPingStatus.Code.PENDING);
4543
PingStatusGenerator.updatePongStatusOutputDownloadSpeed(startTask, downloadSpeed, networkSpeedUnit);

‎src/main/java/dev/dsf/bpe/service/pong/StoreUploadSpeed.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import org.slf4j.LoggerFactory;
1414

1515
import dev.dsf.bpe.CodeSystem;
16-
import dev.dsf.bpe.util.task.NetworkSpeedCalculator;
1716
import dev.dsf.bpe.util.task.output.generator.PingStatusGenerator;
1817
import dev.dsf.bpe.v1.ProcessPluginApi;
1918
import dev.dsf.bpe.v1.activity.AbstractServiceDelegate;
@@ -44,7 +43,7 @@ protected void doExecute(DelegateExecution delegateExecution, Variables variable
4443
Duration uploadedDuration = uploadedDurationTaskInput
4544
.map(duration -> Duration.ofMillis(duration.getValue().longValue())).orElse(Duration.ZERO);
4645

47-
BigDecimal uploadSpeed = NetworkSpeedCalculator.calculate(uploadedBytes, uploadedDuration, networkSpeedUnit);
46+
BigDecimal uploadSpeed = networkSpeedUnit.calculateSpeed(uploadedBytes, uploadedDuration);
4847

4948
PingStatusGenerator.updatePongStatusOutputUploadSpeed(startTask, uploadSpeed, networkSpeedUnit);
5049

‎src/main/java/dev/dsf/bpe/util/task/NetworkSpeedCalculator.java‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)