From f247598982fd82aeb2c609434cf875daef3ffabb Mon Sep 17 00:00:00 2001 From: Stephan Ewen Date: Fri, 13 Jul 2018 12:33:29 +0200 Subject: [PATCH] [hotfix] [core] Fix checkstyle workaround in FileSystem --- .../main/java/org/apache/flink/core/fs/FileSystem.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/flink-core/src/main/java/org/apache/flink/core/fs/FileSystem.java b/flink-core/src/main/java/org/apache/flink/core/fs/FileSystem.java index 8698595cc61..27255f94075 100644 --- a/flink-core/src/main/java/org/apache/flink/core/fs/FileSystem.java +++ b/flink-core/src/main/java/org/apache/flink/core/fs/FileSystem.java @@ -229,9 +229,7 @@ public abstract class FileSystem { /** The default filesystem scheme to be used, configured during process-wide initialization. * This value defaults to the local file systems scheme {@code 'file:///'} or {@code 'file:/'}. */ - //CHECKSTYLE.OFF: StaticVariableName - private static URI DEFAULT_SCHEME; - //CHECKSTYLE.ON: StaticVariableName + private static URI defaultScheme; // ------------------------------------------------------------------------ // Initialization @@ -275,11 +273,11 @@ public abstract class FileSystem { // also read the default file system scheme final String stringifiedUri = config.getString(CoreOptions.DEFAULT_FILESYSTEM_SCHEME, null); if (stringifiedUri == null) { - DEFAULT_SCHEME = null; + defaultScheme = null; } else { try { - DEFAULT_SCHEME = new URI(stringifiedUri); + defaultScheme = new URI(stringifiedUri); } catch (URISyntaxException e) { throw new IllegalConfigurationException("The default file system scheme ('" + @@ -427,7 +425,7 @@ public abstract class FileSystem { * @return The default file system URI */ public static URI getDefaultFsUri() { - return DEFAULT_SCHEME != null ? DEFAULT_SCHEME : LocalFileSystem.getLocalFsURI(); + return defaultScheme != null ? defaultScheme : LocalFileSystem.getLocalFsURI(); } // ------------------------------------------------------------------------ -- GitLab