refactor(toolkit): Rename package org.sonar.plsqlopen.toolkit to com.…

…felipebz.zpa.toolkit
felipebz · Sep 29, 2024 · 8c4ba16 · 8c4ba16
1 parent 1ca3c0e
commit 8c4ba16
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/zpa-toolkit/build.gradle.kts b/zpa-toolkit/build.gradle.kts
@@ -19,7 +19,7 @@ val shadowJar = tasks.named<ShadowJar>("shadowJar") {
     archiveClassifier.set("")
     manifest {
         attributes(mapOf(
-            "Main-Class" to "org.sonar.plsqlopen.toolkit.PlSqlToolkitKt",
+            "Main-Class" to "com.felipebz.zpa.toolkit.ZpaToolkitKt",
             "Add-Opens" to "java.desktop/sun.awt.shell"
         ))
     }

diff --git a/...qlopen/toolkit/PlSqlConfigurationModel.kt → ...pebz/zpa/toolkit/ZpaConfigurationModel.kt b/...qlopen/toolkit/PlSqlConfigurationModel.kt → ...pebz/zpa/toolkit/ZpaConfigurationModel.kt
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.plsqlopen.toolkit
+package com.felipebz.zpa.toolkit
 
 import com.felipebz.flr.api.Grammar
 import com.felipebz.flr.impl.Parser
@@ -27,9 +27,10 @@ import com.felipebz.flr.toolkit.Validators
 import org.sonar.plsqlopen.parser.PlSqlParser
 import org.sonar.plsqlopen.squid.PlSqlConfiguration
 import org.sonar.plsqlopen.utils.log.Loggers
+import java.lang.Boolean
 import java.nio.charset.Charset
 
-class PlSqlConfigurationModel : AbstractConfigurationModel() {
+class ZpaConfigurationModel : AbstractConfigurationModel() {
 
     internal var charsetProperty = ConfigurationProperty("Charset",
         CHARSET_PROPERTY_KEY,
@@ -42,7 +43,7 @@ class PlSqlConfigurationModel : AbstractConfigurationModel() {
         Validators.booleanValidator())
 
     internal val configuration: PlSqlConfiguration
-        get() = PlSqlConfiguration(Charset.forName(charsetProperty.value), java.lang.Boolean.valueOf(errorRecoveryProperty.value))
+        get() = PlSqlConfiguration(Charset.forName(charsetProperty.value), Boolean.valueOf(errorRecoveryProperty.value))
 
     override val charset: Charset
         get() = Charset.forName(charsetProperty.value)
@@ -53,7 +54,7 @@ class PlSqlConfigurationModel : AbstractConfigurationModel() {
     override fun doGetParser(): Parser<Grammar> = PlSqlParser.create(configuration)
 
     companion object {
-        private val LOG = Loggers.getLogger(PlSqlConfigurationModel::class.java)
+        private val LOG = Loggers.getLogger(ZpaConfigurationModel::class.java)
         private const val CHARSET_PROPERTY_KEY = "sonar.sourceEncoding"
         private const val ERROR_RECOVERY_PROPERTY_KEY = "sonar.zpa.errorRecoveryEnabled"
 

diff --git a/...g/sonar/plsqlopen/toolkit/PlSqlToolkit.kt → ...in/com/felipebz/zpa/toolkit/ZpaToolkit.kt b/...g/sonar/plsqlopen/toolkit/PlSqlToolkit.kt → ...in/com/felipebz/zpa/toolkit/ZpaToolkit.kt
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.plsqlopen.toolkit
+package com.felipebz.zpa.toolkit
 
 import com.felipebz.flr.toolkit.Toolkit
 
 fun main() {
-    val toolkit = Toolkit("ZPA Toolkit", PlSqlConfigurationModel())
+    val toolkit = Toolkit("ZPA Toolkit", ZpaConfigurationModel())
     toolkit.run()
 }
diff --git a/...en/toolkit/PlSqlConfigurationModelTest.kt → .../zpa/toolkit/ZpaConfigurationModelTest.kt b/...en/toolkit/PlSqlConfigurationModelTest.kt → .../zpa/toolkit/ZpaConfigurationModelTest.kt
@@ -17,17 +17,17 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.plsqlopen.toolkit
+package com.felipebz.zpa.toolkit
 
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import java.nio.charset.StandardCharsets
 
-class PlSqlConfigurationModelTest {
+class ZpaConfigurationModelTest {
 
     @Test
     fun getConfiguration_charset() {
-        val model = PlSqlConfigurationModel()
+        val model = ZpaConfigurationModel()
         model.charsetProperty.value = "UTF-8"
         assertThat(model.charset).isEqualTo(StandardCharsets.UTF_8)
         assertThat(model.configuration.charset).isEqualTo(StandardCharsets.UTF_8)
@@ -42,7 +42,7 @@ class PlSqlConfigurationModelTest {
 
         try {
             System.setProperty("foo", "bar")
-            assertThat(PlSqlConfigurationModel.getPropertyOrDefaultValue("foo", "baz")).isEqualTo("bar")
+            assertThat(ZpaConfigurationModel.getPropertyOrDefaultValue("foo", "baz")).isEqualTo("bar")
         } finally {
             if (oldValue == null) {
                 System.clearProperty("foo")
@@ -58,7 +58,7 @@ class PlSqlConfigurationModelTest {
 
         try {
             System.clearProperty("foo")
-            assertThat(PlSqlConfigurationModel.getPropertyOrDefaultValue("foo", "baz")).isEqualTo("baz")
+            assertThat(ZpaConfigurationModel.getPropertyOrDefaultValue("foo", "baz")).isEqualTo("baz")
         } finally {
             if (oldValue == null) {
                 System.clearProperty("foo")