Skip to content

Commit d77d86b

Browse files
authored
refactor!: Move FileIOUtils to more appropriate package (#22937)
1 parent cbe67b5 commit d77d86b

File tree

39 files changed

+56
-27
lines changed

39 files changed

+56
-27
lines changed

flow-lit-template/src/main/java/com/vaadin/flow/component/littemplate/internal/LitTemplateParserImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@
3838
import com.vaadin.flow.di.Lookup;
3939
import com.vaadin.flow.di.ResourceProvider;
4040
import com.vaadin.flow.internal.AnnotationReader;
41+
import com.vaadin.flow.internal.FileIOUtils;
4142
import com.vaadin.flow.internal.Pair;
4243
import com.vaadin.flow.server.Constants;
4344
import com.vaadin.flow.server.DependencyFilter;
4445
import com.vaadin.flow.server.VaadinService;
45-
import com.vaadin.flow.server.frontend.FileIOUtils;
4646
import com.vaadin.flow.server.frontend.FrontendUtils;
4747
import com.vaadin.flow.shared.ui.Dependency;
4848
import com.vaadin.flow.shared.ui.LoadMode;

flow-plugins/flow-plugin-base/src/main/java/com/vaadin/flow/plugin/base/BuildFrontendUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@
4646
import tools.jackson.databind.node.ObjectNode;
4747

4848
import com.vaadin.flow.di.Lookup;
49+
import com.vaadin.flow.internal.FileIOUtils;
4950
import com.vaadin.flow.internal.JacksonUtils;
5051
import com.vaadin.flow.server.Constants;
5152
import com.vaadin.flow.server.InitParameters;
5253
import com.vaadin.flow.server.frontend.ExecutionFailedException;
53-
import com.vaadin.flow.server.frontend.FileIOUtils;
5454
import com.vaadin.flow.server.frontend.FrontendTools;
5555
import com.vaadin.flow.server.frontend.FrontendToolsSettings;
5656
import com.vaadin.flow.server.frontend.FrontendUtils;

flow-plugins/flow-plugin-base/src/test/java/com/vaadin/flow/plugin/base/BuildFrontendUtilTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@
5252

5353
import com.vaadin.experimental.FeatureFlags;
5454
import com.vaadin.flow.di.Lookup;
55+
import com.vaadin.flow.internal.FileIOUtils;
5556
import com.vaadin.flow.internal.JacksonUtils;
5657
import com.vaadin.flow.server.Constants;
5758
import com.vaadin.flow.server.InitParameters;
5859
import com.vaadin.flow.server.PwaConfiguration;
5960
import com.vaadin.flow.server.frontend.EndpointGeneratorTaskFactory;
6061
import com.vaadin.flow.server.frontend.ExecutionFailedException;
61-
import com.vaadin.flow.server.frontend.FileIOUtils;
6262
import com.vaadin.flow.server.frontend.FrontendTools;
6363
import com.vaadin.flow.server.frontend.FrontendUtils;
6464
import com.vaadin.flow.server.frontend.TaskGenerateEndpoint;

flow-polymer-template/src/main/java/com/vaadin/flow/component/polymertemplate/NpmTemplateParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@
2828
import com.vaadin.flow.di.Lookup;
2929
import com.vaadin.flow.di.ResourceProvider;
3030
import com.vaadin.flow.internal.AnnotationReader;
31+
import com.vaadin.flow.internal.FileIOUtils;
3132
import com.vaadin.flow.internal.Pair;
3233
import com.vaadin.flow.server.Constants;
3334
import com.vaadin.flow.server.DependencyFilter;
3435
import com.vaadin.flow.server.VaadinService;
35-
import com.vaadin.flow.server.frontend.FileIOUtils;
3636
import com.vaadin.flow.server.frontend.FrontendUtils;
3737
import com.vaadin.flow.shared.ui.Dependency;
3838
import com.vaadin.flow.shared.ui.LoadMode;

flow-server/src/main/java/com/vaadin/flow/server/frontend/FileIOUtils.java renamed to flow-server/src/main/java/com/vaadin/flow/internal/FileIOUtils.java

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* License for the specific language governing permissions and limitations under
1414
* the License.
1515
*/
16-
package com.vaadin.flow.server.frontend;
16+
package com.vaadin.flow.internal;
1717

1818
import java.io.File;
1919
import java.io.FileFilter;
@@ -40,8 +40,6 @@
4040
import org.slf4j.Logger;
4141
import org.slf4j.LoggerFactory;
4242

43-
import com.vaadin.flow.internal.StringUtil;
44-
4543
/**
4644
* Utility class for file I/O operations, including conditional file writing,
4745
* file searching, and content comparison.
@@ -50,6 +48,10 @@
5048
*/
5149
public class FileIOUtils {
5250

51+
private FileIOUtils() {
52+
// Utils only
53+
}
54+
5355
/**
5456
* Deletes file if it exists and eats exceptions.
5557
*
@@ -59,7 +61,7 @@ public class FileIOUtils {
5961
* to be deleted
6062
* @return true if succeeded
6163
*/
62-
static boolean deleteFileQuietly(File file) {
64+
public static boolean deleteFileQuietly(File file) {
6365
if (file == null) {
6466
return false;
6567
}
@@ -80,7 +82,7 @@ static boolean deleteFileQuietly(File file) {
8082
* @return string from the content
8183
* @throws IOException
8284
*/
83-
static String urlToString(URL url) throws IOException {
85+
public static String urlToString(URL url) throws IOException {
8486
try (InputStream input = url.openStream()) {
8587
return StringUtil.toUTF8String(input);
8688
}
@@ -184,7 +186,7 @@ public FileVisitResult postVisitDirectory(Path dir,
184186
*
185187
* @return the user's home directory
186188
*/
187-
static File getUserDirectory() {
189+
public static File getUserDirectory() {
188190
return new File(System.getProperty("user.home"));
189191
}
190192

@@ -202,7 +204,7 @@ static File getUserDirectory() {
202204
* @throws IOException
203205
* if an I/O error occurs
204206
*/
205-
static List<File> listFiles(File directory, String[] extensions,
207+
public static List<File> listFiles(File directory, String[] extensions,
206208
boolean recursive) throws IOException {
207209
List<File> result = new ArrayList<>();
208210
if (!directory.isDirectory()) {
@@ -243,7 +245,7 @@ static List<File> listFiles(File directory, String[] extensions,
243245
* @throws IOException
244246
* if an I/O error occurs
245247
*/
246-
static boolean contentEquals(InputStream input1, InputStream input2)
248+
public static boolean contentEquals(InputStream input1, InputStream input2)
247249
throws IOException {
248250
return Arrays.equals(input1.readAllBytes(), input2.readAllBytes());
249251
}
@@ -254,7 +256,7 @@ static boolean contentEquals(InputStream input1, InputStream input2)
254256
* @param closeable
255257
* the resource to close
256258
*/
257-
static void closeQuietly(AutoCloseable closeable) {
259+
public static void closeQuietly(AutoCloseable closeable) {
258260
if (closeable != null) {
259261
try {
260262
closeable.close();
@@ -311,7 +313,7 @@ public static boolean wildcardMatch(String text, String pattern) {
311313
* @throws IOException
312314
* if an I/O error occurs
313315
*/
314-
static boolean isEmptyDirectory(Path directory) throws IOException {
316+
public static boolean isEmptyDirectory(Path directory) throws IOException {
315317
if (!Files.isDirectory(directory)) {
316318
return false;
317319
}
@@ -320,10 +322,6 @@ static boolean isEmptyDirectory(Path directory) throws IOException {
320322
}
321323
}
322324

323-
private FileIOUtils() {
324-
// Utils only
325-
}
326-
327325
/**
328326
* Writes the given content into the given file unless the file already
329327
* contains that content.

flow-server/src/main/java/com/vaadin/flow/server/AbstractConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
import java.nio.file.Path;
2121
import java.nio.file.Paths;
2222

23+
import com.vaadin.flow.internal.FileIOUtils;
2324
import com.vaadin.flow.server.frontend.BundleUtils;
24-
import com.vaadin.flow.server.frontend.FileIOUtils;
2525
import com.vaadin.flow.server.frontend.FrontendUtils;
2626

2727
import static com.vaadin.flow.server.InitParameters.SERVLET_PARAMETER_DISABLE_XSRF_PROTECTION;

flow-server/src/main/java/com/vaadin/flow/server/communication/IndexHtmlRequestHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
import com.vaadin.flow.internal.BrowserLiveReload;
5050
import com.vaadin.flow.internal.BrowserLiveReload.Backend;
5151
import com.vaadin.flow.internal.BrowserLiveReloadAccessor;
52+
import com.vaadin.flow.internal.FileIOUtils;
5253
import com.vaadin.flow.internal.JacksonUtils;
5354
import com.vaadin.flow.internal.LocaleUtil;
5455
import com.vaadin.flow.internal.UsageStatisticsExporter;
@@ -65,7 +66,6 @@
6566
import com.vaadin.flow.server.VaadinService;
6667
import com.vaadin.flow.server.VaadinServletContext;
6768
import com.vaadin.flow.server.VaadinSession;
68-
import com.vaadin.flow.server.frontend.FileIOUtils;
6969
import com.vaadin.flow.server.frontend.FrontendUtils;
7070
import com.vaadin.flow.server.frontend.ThemeUtils;
7171
import com.vaadin.flow.server.startup.ApplicationConfiguration;

flow-server/src/main/java/com/vaadin/flow/server/frontend/BundleUtils.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import tools.jackson.databind.node.ObjectNode;
3535

3636
import com.vaadin.flow.component.Component;
37+
import com.vaadin.flow.internal.FileIOUtils;
3738
import com.vaadin.flow.internal.JacksonUtils;
3839
import com.vaadin.flow.internal.StringUtil;
3940
import com.vaadin.flow.server.Constants;

flow-server/src/main/java/com/vaadin/flow/server/frontend/BundleValidationUtil.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
import com.vaadin.flow.component.Component;
4343
import com.vaadin.flow.component.WebComponentExporter;
4444
import com.vaadin.flow.component.WebComponentExporterFactory;
45+
import com.vaadin.flow.internal.FileIOUtils;
4546
import com.vaadin.flow.internal.JacksonUtils;
4647
import com.vaadin.flow.internal.StringUtil;
4748
import com.vaadin.flow.internal.UsageStatistics;

flow-server/src/main/java/com/vaadin/flow/server/frontend/DevBundleUtils.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.slf4j.Logger;
2323
import org.slf4j.LoggerFactory;
2424

25+
import com.vaadin.flow.internal.FileIOUtils;
2526
import com.vaadin.flow.server.Constants;
2627

2728
/**

0 commit comments

Comments
 (0)