Merge remote-tracking branch 'origin/checkstyle-enforcement' into checkstyle-enforcement

# Conflicts:
#	operator/pom.xml

Author: ddsharpe

json-schema-maven-plugin/pom.xml

@@ -69,19 +69,6 @@
           </mojoDependencies>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>com.coveo</groupId>
-        <artifactId>fmt-maven-plugin</artifactId>
-        <version>2.8</version>
-        <executions>
-          <execution>
-            <phase>test</phase>
-            <goals>
-              <goal>check</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 </project>

json-schema-maven-plugin/src/main/java/oracle/kubernetes/json/mojo/ExternalSchema.java

@@ -22,7 +22,7 @@ URL getUrl() throws MalformedURLException {
     return new URL(url);
   }
 
-  URL getCacheURL(String baseDir) throws MalformedURLException {
+  URL getCacheUrl(String baseDir) throws MalformedURLException {
     return new File(new File(baseDir), cache).toURI().toURL();
   }
 }

json-schema-maven-plugin/src/main/java/oracle/kubernetes/json/mojo/FileSystem.java

@@ -18,7 +18,7 @@ abstract class FileSystem {
 
   static final FileSystem LIVE_FILE_SYSTEM = new LiveFileSystem();
 
-  abstract URL toURL(File file) throws MalformedURLException;
+  abstract URL toUrl(File file) throws MalformedURLException;
 
   abstract File[] listFiles(File directory);
 
@@ -41,7 +41,7 @@ abstract class FileSystem {
   private static class LiveFileSystem extends FileSystem {
 
     @Override
-    URL toURL(File file) throws MalformedURLException {
+    URL toUrl(File file) throws MalformedURLException {
       return file.toURI().toURL();
     }
 

json-schema-maven-plugin/src/main/java/oracle/kubernetes/json/mojo/JsonSchemaMojo.java

@@ -12,6 +12,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
@@ -91,7 +92,7 @@ private void addExternalSchemas() throws MojoExecutionException {
       if (kubernetesVersion != null) main.setKubernetesVersion(kubernetesVersion);
       for (ExternalSchema externalSchema : externalSchemas)
         main.defineSchemaUrlAndContents(
-            externalSchema.getUrl(), externalSchema.getCacheURL(baseDir));
+            externalSchema.getUrl(), externalSchema.getCacheUrl(baseDir));
     } catch (IOException e) {
       throw new MojoExecutionException("Unable to define external schema: ", e);
     }
@@ -117,12 +118,12 @@ private File getMarkdownFile() {
   }
 
   private URL[] toUrls(List<String> paths) {
-    return paths.stream().map(this::toURL).toArray(URL[]::new);
+    return paths.stream().map(this::toUrl).toArray(URL[]::new);
   }
 
-  private URL toURL(String classpathElement) {
+  private URL toUrl(String classpathElement) {
     try {
-      return fileSystem.toURL(new File(classpathElement));
+      return fileSystem.toUrl(new File(classpathElement));
     } catch (MalformedURLException e) {
       throw new UncheckedMalformedUrlException(e);
     }

json-schema-maven-plugin/src/main/java/oracle/kubernetes/json/mojo/Main.java

@@ -8,6 +8,7 @@
 import java.io.IOException;
 import java.net.URL;
 import java.util.Map;
+
 import org.apache.maven.plugin.MojoExecutionException;
 
 public interface Main {
@@ -23,11 +24,11 @@ public interface Main {
   /**
    * Defines an external schema URL to be used for object definitions.
    *
-   * @param schemaURL the schema URL
+   * @param schemaUrl the schema URL
    * @param cacheUrl a file url specifying a local cache of the schema
    * @throws IOException if there is a problem using the URLs
    */
-  void defineSchemaUrlAndContents(URL schemaURL, URL cacheUrl) throws IOException;
+  void defineSchemaUrlAndContents(URL schemaUrl, URL cacheUrl) throws IOException;
 
   /**
    * Specifies that deprecated fields should be included when generating a schema. If false, they

json-schema-maven-plugin/src/main/java/oracle/kubernetes/json/mojo/MainImpl.java

@@ -10,6 +10,7 @@
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.Map;
+
 import oracle.kubernetes.json.SchemaGenerator;
 import oracle.kubernetes.json.YamlDocGenerator;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -51,8 +52,8 @@ public void setKubernetesVersion(String kubernetesVersion) throws IOException {
   }
 
   @Override
-  public void defineSchemaUrlAndContents(URL schemaURL, URL cacheUrl) throws IOException {
-    generator.addExternalSchema(schemaURL, cacheUrl);
+  public void defineSchemaUrlAndContents(URL schemaUrl, URL cacheUrl) throws IOException {
+    generator.addExternalSchema(schemaUrl, cacheUrl);
   }
 
   @SuppressWarnings("ResultOfMethodCallIgnored")

json-schema-maven-plugin/src/test/java/oracle/kubernetes/json/mojo/TestFileSystem.java

@@ -76,7 +76,7 @@ void defineURL(File file, URL url) {
   }
 
   @Override
-  URL toURL(File file) throws MalformedURLException {
+  URL toUrl(File file) throws MalformedURLException {
     return urls.get(file);
   }
 

json-schema-maven-plugin/src/test/java/oracle/kubernetes/json/mojo/TestMain.java

@@ -92,8 +92,8 @@ public void setKubernetesVersion(String kubernetesVersion) {
   }
 
   @Override
-  public void defineSchemaUrlAndContents(URL schemaURL, URL cacheUrl) {
-    schemas.put(schemaURL, cacheUrl);
+  public void defineSchemaUrlAndContents(URL schemaUrl, URL cacheUrl) {
+    schemas.put(schemaUrl, cacheUrl);
   }
 
   @Override

json-schema/src/main/java/oracle/kubernetes/json/EnumClass.java

@@ -4,12 +4,12 @@
 
 package oracle.kubernetes.json;
 
-import static java.lang.annotation.ElementType.FIELD;
-
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import static java.lang.annotation.ElementType.FIELD;
+
 /** Specifies an enum class whose values match the permitted values for the field. */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(FIELD)

json-schema/src/main/java/oracle/kubernetes/json/Pattern.java

@@ -4,12 +4,12 @@
 
 package oracle.kubernetes.json;
 
-import static java.lang.annotation.ElementType.FIELD;
-
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import static java.lang.annotation.ElementType.FIELD;
+
 /** Supplies an ECMA 262 regular expression that the field must match. */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(FIELD)