Merge pull request #204 from mvegter/refactor/minor-improvements

Some minor improvements

Author: csviri

.gitignore

@@ -2,5 +2,10 @@ target/
 *.iml
 .idea/
 
+# Eclipse
+.settings/
+.classpath
+.project
+
 #  VSCode
 .factorypath

docs/_includes/footer.html

@@ -8,7 +8,7 @@
     </div>
     <div class="footer-title">
      Sponsored by
-      <a href="https://container-solutions.com/" target="_blank">
+      <a href="https://container-solutions.com/" target="_blank" rel="noopener noreferrer">
         <img src="{{ site.baseurl }}/assets/images/cs.png">
       </a>
     </div>

docs/_includes/header.html

@@ -1,9 +1,9 @@
 <div class="header-strip {{ page.collection }} {{ page.name | split: "." | first }}">
   <div class="header navbar navbar-expand-lg">
     <div class="logo">
-       <a href="https://github.com/ContainerSolutions/java-operator-sdk/blob/master/README.md" target="_blank">
+       <a href="https://github.com/ContainerSolutions/java-operator-sdk/blob/master/README.md" target="_blank" rel="noopener noreferrer">
       <img src="{{ site.baseurl }}/assets/images/GitHub-Mark-64px.png">
-       <a href="https://discord.gg/DacEhAy" target="_blank">
+       <a href="https://discord.gg/DacEhAy" target="_blank" rel="noopener noreferrer">
       <img src="{{ site.baseurl }}/assets/images/discord.png">
       </a>
     </div>

operator-framework/src/main/java/com/github/containersolutions/operator/ControllerUtils.java

@@ -17,7 +17,7 @@ public class ControllerUtils {
 
     private final static double JAVA_VERSION = Double.parseDouble(System.getProperty("java.specification.version"));
 
-    private final static Logger log = LoggerFactory.getLogger(Operator.class);
+    private final static Logger log = LoggerFactory.getLogger(ControllerUtils.class);
 
     // this is just to support testing, this way we don't try to create class multiple times in memory with same name.
     // note that other solution is to add a random string to doneable class name

samples/mysql-schema/src/main/java/com/github/containersolutions/operator/sample/SchemaController.java

@@ -15,6 +15,7 @@
 import java.sql.DriverManager;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.util.Base64;
 
 import static java.lang.String.format;
@@ -38,21 +39,27 @@ public SchemaController(KubernetesClient kubernetesClient) {
     public UpdateControl<Schema> createOrUpdateResource(Schema schema, Context<Schema> context) {
         try (Connection connection = getConnection()) {
             if (!schemaExists(connection, schema.getMetadata().getName())) {
-                connection.createStatement().execute(format("CREATE SCHEMA `%1$s` DEFAULT CHARACTER SET %2$s",
+                try (Statement statement = connection.createStatement()) {
+                    statement.execute(format("CREATE SCHEMA `%1$s` DEFAULT CHARACTER SET %2$s",
                         schema.getMetadata().getName(),
                         schema.getSpec().getEncoding()));
+                }
 
                 String password = RandomStringUtils.randomAlphanumeric(16);
                 String userName = String.format(USERNAME_FORMAT,
                         schema.getMetadata().getName());
                 String secretName = String.format(SECRET_FORMAT,
                         schema.getMetadata().getName());
-                connection.createStatement().execute(format(
-                        "CREATE USER '%1$s' IDENTIFIED BY '%2$s'",
-                        userName, password));
-                connection.createStatement().execute(format(
-                        "GRANT ALL ON `%1$s`.* TO '%2$s'",
-                        schema.getMetadata().getName(), userName));
+                try (Statement statement = connection.createStatement()) {
+                    statement.execute(format("CREATE USER '%1$s' IDENTIFIED BY '%2$s'",
+                            userName,
+                            password));
+                }
+                try (Statement statement = connection.createStatement()) {
+                    statement.execute(format("GRANT ALL ON `%1$s`.* TO '%2$s'",
+                        schema.getMetadata().getName(),
+                        userName));
+                }
                 Secret credentialsSecret = new SecretBuilder()
                         .withNewMetadata().withName(secretName).endMetadata()
                         .addToData("MYSQL_USERNAME", Base64.getEncoder().encodeToString(userName.getBytes()))
@@ -95,11 +102,17 @@ public boolean deleteResource(Schema schema, Context<Schema> context) {
 
         try (Connection connection = getConnection()) {
             if (schemaExists(connection, schema.getMetadata().getName())) {
-                connection.createStatement().execute("DROP DATABASE `" + schema.getMetadata().getName() + "`");
+                try (Statement statement = connection.createStatement()) {
+                    statement.execute(format("DROP DATABASE `%1$s`",
+                        schema.getMetadata().getName()));
+                }
                 log.info("Deleted Schema '{}'", schema.getMetadata().getName());
 
                 if (userExists(connection, schema.getStatus().getUserName())) {
-                    connection.createStatement().execute("DROP USER '" + schema.getStatus().getUserName() + "'");
+                    try (Statement statement = connection.createStatement()) {
+                        statement.execute(format("DROP USER '%1$s'",
+                            schema.getStatus().getUserName()));
+                    }
                     log.info("Deleted User '{}'", schema.getStatus().getUserName());
                 }
 
@@ -134,9 +147,10 @@ private boolean schemaExists(Connection connection, String schemaName) throws SQ
     }
 
     private boolean userExists(Connection connection, String userName) throws SQLException {
-        ResultSet resultSet = connection.createStatement().executeQuery(
-                format("SELECT User FROM mysql.user WHERE User='%1$s'", userName)
-        );
-        return resultSet.first();
+        try (Statement statement = connection.createStatement()) {
+            ResultSet resultSet = statement.executeQuery(format("SELECT User FROM mysql.user WHERE User='%1$s'",
+                userName));
+            return resultSet.first();
+        }
     }
 }