Skip to content

[MNG-8150] Remove unused locale argument from FileSizeFormat #1579

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 11, 2024
Merged

[MNG-8150] Remove unused locale argument from FileSizeFormat #1579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2369134
[MNG-8150] Remove unused locale argument from FileSizeFormat
pshevche Jun 11, 2024
e364af5
Merge branch 'master' into pshevche/8150-clean-up-file-size-format
cstamas Jun 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions ...n-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
package org.apache.maven.cli.transfer;

import java.io.PrintStream;
import java.util.Locale;

import org.apache.maven.api.services.MessageBuilder;
import org.apache.maven.api.services.MessageBuilderFactory;
Expand Down Expand Up @@ -72,7 +71,7 @@ public void transferSucceeded(TransferEvent event) {

TransferResource resource = event.getResource();
long contentLength = event.getTransferredBytes();
FileSizeFormat format = new FileSizeFormat(Locale.ENGLISH);
FileSizeFormat format = new FileSizeFormat();

MessageBuilder message = messageBuilderFactory.builder();
message.append(action).style(STYLE).append(' ').append(direction).append(' ');
Expand Down
3 changes: 1 addition & 2 deletions maven-embedder/src/main/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import java.io.PrintStream;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Locale;
import java.util.Map;

import org.apache.maven.api.services.MessageBuilderFactory;
Expand All @@ -37,7 +36,7 @@
public class ConsoleMavenTransferListener extends AbstractMavenTransferListener {

private final Map<TransferResourceIdentifier, TransferResourceAndSize> transfers = new LinkedHashMap<>();
private final FileSizeFormat format = new FileSizeFormat(Locale.ENGLISH); // use in a synchronized fashion
private final FileSizeFormat format = new FileSizeFormat(); // use in a synchronized fashion
private final StringBuilder buffer = new StringBuilder(128); // use in a synchronized fashion

private final boolean printResourceNames;
Expand Down
4 changes: 0 additions & 4 deletions maven-embedder/src/main/java/org/apache/maven/cli/transfer/FileSizeFormat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
*/
package org.apache.maven.cli.transfer;

import java.util.Locale;

import org.apache.maven.api.services.MessageBuilder;

/**
Expand Down Expand Up @@ -101,8 +99,6 @@ public static ScaleUnit getScaleUnit(long size) {
}
}

public FileSizeFormat(Locale locale) {}

public String format(long size) {
return format(size, null);
}
Expand Down
4 changes: 1 addition & 3 deletions maven-embedder/src/main/java/org/apache/maven/cli/transfer/Slf4jMavenTransferListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
*/
package org.apache.maven.cli.transfer;

import java.util.Locale;

import org.eclipse.aether.transfer.AbstractTransferListener;
import org.eclipse.aether.transfer.TransferCancelledException;
import org.eclipse.aether.transfer.TransferEvent;
Expand Down Expand Up @@ -75,7 +73,7 @@ public void transferSucceeded(TransferEvent event) {

TransferResource resource = event.getResource();
long contentLength = event.getTransferredBytes();
FileSizeFormat format = new FileSizeFormat(Locale.ENGLISH);
FileSizeFormat format = new FileSizeFormat();

StringBuilder message = new StringBuilder();
message.append(action).append(' ').append(direction).append(' ').append(resource.getRepositoryId());
Expand Down
18 changes: 8 additions & 10 deletions maven-embedder/src/test/java/org/apache/maven/cli/transfer/FileSizeFormatTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
*/
package org.apache.maven.cli.transfer;

import java.util.Locale;

import org.apache.maven.cli.transfer.FileSizeFormat.ScaleUnit;
import org.junit.jupiter.api.Test;

Expand All @@ -30,15 +28,15 @@ class FileSizeFormatTest {

@Test
void testNegativeSize() {
FileSizeFormat format = new FileSizeFormat(Locale.ENGLISH);
FileSizeFormat format = new FileSizeFormat();

long negativeSize = -100L;
assertThrows(IllegalArgumentException.class, () -> format.format(negativeSize));
}

@Test
void testSize() {
FileSizeFormat format = new FileSizeFormat(Locale.ENGLISH);
FileSizeFormat format = new FileSizeFormat();

long _0_bytes = 0L;
assertEquals("0 B", format.format(_0_bytes));
Expand Down Expand Up @@ -103,7 +101,7 @@ void testSize() {

@Test
void testSizeWithSelectedScaleUnit() {
FileSizeFormat format = new FileSizeFormat(Locale.ENGLISH);
FileSizeFormat format = new FileSizeFormat();

long _0_bytes = 0L;
assertEquals("0 B", format.format(_0_bytes));
Expand Down Expand Up @@ -206,22 +204,22 @@ void testSizeWithSelectedScaleUnit() {

@Test
void testNegativeProgressedSize() {
FileSizeFormat format = new FileSizeFormat(Locale.ENGLISH);
FileSizeFormat format = new FileSizeFormat();

long negativeProgressedSize = -100L;
assertThrows(IllegalArgumentException.class, () -> format.formatProgress(negativeProgressedSize, 10L));
}

@Test
void testNegativeProgressedSizeBiggerThanSize() {
FileSizeFormat format = new FileSizeFormat(Locale.ENGLISH);
FileSizeFormat format = new FileSizeFormat();

assertThrows(IllegalArgumentException.class, () -> format.formatProgress(100L, 10L));
}

@Test
void testProgressedSizeWithoutSize() {
FileSizeFormat format = new FileSizeFormat(Locale.ENGLISH);
FileSizeFormat format = new FileSizeFormat();

long _0_bytes = 0L;
assertEquals("0 B", format.formatProgress(_0_bytes, -1L));
Expand All @@ -238,15 +236,15 @@ void testProgressedSizeWithoutSize() {

@Test
void testProgressedBothZero() {
FileSizeFormat format = new FileSizeFormat(Locale.ENGLISH);
FileSizeFormat format = new FileSizeFormat();

long _0_bytes = 0L;
assertEquals("0 B", format.formatProgress(_0_bytes, _0_bytes));
}

@Test
void testProgressedSizeWithSize() {
FileSizeFormat format = new FileSizeFormat(Locale.ENGLISH);
FileSizeFormat format = new FileSizeFormat();

long _0_bytes = 0L;
long _400_bytes = 400L;
Expand Down