Skip to content

Commit 6ca8f13

Browse files
authored
Merge pull request #124 from schemacrawler/cleanup
Reorganize and clean up code
2 parents 698ccfb + 6cdb1b6 commit 6ca8f13

34 files changed

+187
-387
lines changed

schemacrawler-ai-core/src/main/java/module-info.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
module us.fatehi.schemacrawler.ai_core {
22
// Dependencies
3-
requires us.fatehi.schemacrawler.schemacrawler;
3+
requires transitive us.fatehi.schemacrawler.schemacrawler;
44
requires us.fatehi.schemacrawler.scripting;
55
requires us.fatehi.schemacrawler.offline;
66
requires us.fatehi.schemacrawler.lint;
77
requires java.logging;
88
requires java.sql;
99
requires com.fasterxml.jackson.module.jsonSchema;
1010
requires com.fasterxml.jackson.core;
11-
requires com.fasterxml.jackson.databind;
11+
requires transitive com.fasterxml.jackson.databind;
1212

1313
// Export only the public API packages
1414
exports schemacrawler.tools.ai.tools;

schemacrawler-ai-core/src/main/java/schemacrawler/tools/ai/functions/DescribeRoutinesFunctionDefinition.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
package schemacrawler.tools.ai.functions;
1010

11-
import schemacrawler.tools.ai.tools.AbstractFunctionDefinition;
11+
import schemacrawler.tools.ai.tools.base.AbstractFunctionDefinition;
1212

1313
public final class DescribeRoutinesFunctionDefinition
1414
extends AbstractFunctionDefinition<DescribeRoutinesFunctionParameters> {

schemacrawler-ai-core/src/main/java/schemacrawler/tools/ai/functions/DescribeRoutinesFunctionExecutor.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import schemacrawler.tools.ai.model.CatalogDocument;
2525
import schemacrawler.tools.ai.model.CompactCatalogUtility;
2626
import schemacrawler.tools.ai.tools.JsonFunctionReturn;
27+
import schemacrawler.tools.ai.tools.base.AbstractJsonFunctionExecutor;
2728
import us.fatehi.utility.property.PropertyName;
2829

2930
public final class DescribeRoutinesFunctionExecutor

schemacrawler-ai-core/src/main/java/schemacrawler/tools/ai/functions/DescribeRoutinesFunctionParameters.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import schemacrawler.tools.ai.model.AdditionalRoutineDetails;
1919
import schemacrawler.tools.ai.tools.FunctionParameters;
2020
import schemacrawler.tools.ai.tools.FunctionReturnType;
21-
import schemacrawler.tools.ai.utility.JsonUtility;
21+
import schemacrawler.tools.ai.tools.base.ParameterUtility;
2222

2323
@JsonNaming(PropertyNamingStrategies.KebabCaseStrategy.class)
2424
public record DescribeRoutinesFunctionParameters(
@@ -72,7 +72,7 @@ public AdditionalRoutineDetails toAdditionalRoutineDetails() {
7272

7373
@Override
7474
public String toString() {
75-
return JsonUtility.parametersToString(this);
75+
return ParameterUtility.parametersToString(this);
7676
}
7777

7878
@JsonIgnore

schemacrawler-ai-core/src/main/java/schemacrawler/tools/ai/functions/DescribeTablesFunctionDefinition.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
package schemacrawler.tools.ai.functions;
1010

11-
import schemacrawler.tools.ai.tools.AbstractFunctionDefinition;
11+
import schemacrawler.tools.ai.tools.base.AbstractFunctionDefinition;
1212

1313
public final class DescribeTablesFunctionDefinition
1414
extends AbstractFunctionDefinition<DescribeTablesFunctionParameters> {

schemacrawler-ai-core/src/main/java/schemacrawler/tools/ai/functions/DescribeTablesFunctionExecutor.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import java.util.ArrayList;
1414
import java.util.Collection;
1515
import schemacrawler.inclusionrule.ExcludeAll;
16+
import schemacrawler.inclusionrule.IncludeAll;
1617
import schemacrawler.inclusionrule.InclusionRule;
1718
import schemacrawler.schemacrawler.GrepOptionsBuilder;
1819
import schemacrawler.schemacrawler.LimitOptionsBuilder;
@@ -23,6 +24,7 @@
2324
import schemacrawler.tools.ai.model.CatalogDocument;
2425
import schemacrawler.tools.ai.model.CompactCatalogUtility;
2526
import schemacrawler.tools.ai.tools.JsonFunctionReturn;
27+
import schemacrawler.tools.ai.tools.base.AbstractJsonFunctionExecutor;
2628
import us.fatehi.utility.property.PropertyName;
2729

2830
public final class DescribeTablesFunctionExecutor
@@ -62,7 +64,8 @@ protected SchemaCrawlerOptions createSchemaCrawlerOptions() {
6264
LimitOptionsBuilder.builder()
6365
.includeSynonyms(new ExcludeAll())
6466
.includeSequences(new ExcludeAll())
65-
.includeRoutines(new ExcludeAll());
67+
.includeRoutines(new ExcludeAll())
68+
.includeTables(new IncludeAll());
6669
final InclusionRule grepTablesPattern = makeInclusionRule(commandOptions.tableName());
6770
final GrepOptionsBuilder grepOptionsBuilder =
6871
GrepOptionsBuilder.builder().includeGreppedTables(grepTablesPattern);

schemacrawler-ai-core/src/main/java/schemacrawler/tools/ai/functions/DescribeTablesFunctionParameters.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import schemacrawler.tools.ai.model.AdditionalTableDetails;
1919
import schemacrawler.tools.ai.tools.FunctionParameters;
2020
import schemacrawler.tools.ai.tools.FunctionReturnType;
21-
import schemacrawler.tools.ai.utility.JsonUtility;
21+
import schemacrawler.tools.ai.tools.base.ParameterUtility;
2222

2323
@JsonNaming(PropertyNamingStrategies.KebabCaseStrategy.class)
2424
public record DescribeTablesFunctionParameters(
@@ -79,7 +79,7 @@ public AdditionalTableDetails toAdditionalTableDetails() {
7979

8080
@Override
8181
public String toString() {
82-
return JsonUtility.parametersToString(this);
82+
return ParameterUtility.parametersToString(this);
8383
}
8484

8585
@JsonIgnore

schemacrawler-ai-core/src/main/java/schemacrawler/tools/ai/functions/LintFunctionDefinition.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
package schemacrawler.tools.ai.functions;
1010

11-
import schemacrawler.tools.ai.tools.AbstractFunctionDefinition;
11+
import schemacrawler.tools.ai.tools.base.AbstractFunctionDefinition;
1212

1313
public final class LintFunctionDefinition
1414
extends AbstractFunctionDefinition<LintFunctionParameters> {

schemacrawler-ai-core/src/main/java/schemacrawler/tools/ai/functions/LintFunctionExecutor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
package schemacrawler.tools.ai.functions;
1010

1111
import schemacrawler.inclusionrule.InclusionRule;
12-
import schemacrawler.tools.ai.tools.AbstractExecutableFunctionExecutor;
12+
import schemacrawler.tools.ai.tools.base.AbstractExecutableFunctionExecutor;
1313
import us.fatehi.utility.property.PropertyName;
1414

1515
public final class LintFunctionExecutor

schemacrawler-ai-core/src/main/java/schemacrawler/tools/ai/functions/LintFunctionParameters.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import com.fasterxml.jackson.databind.annotation.JsonNaming;
1616
import schemacrawler.tools.ai.tools.FunctionParameters;
1717
import schemacrawler.tools.ai.tools.FunctionReturnType;
18-
import schemacrawler.tools.ai.utility.JsonUtility;
18+
import schemacrawler.tools.ai.tools.base.ParameterUtility;
1919

2020
@JsonNaming(PropertyNamingStrategies.KebabCaseStrategy.class)
2121
public record LintFunctionParameters(
@@ -39,7 +39,7 @@ table name (including the schema).
3939

4040
@Override
4141
public String toString() {
42-
return JsonUtility.parametersToString(this);
42+
return ParameterUtility.parametersToString(this);
4343
}
4444

4545
@JsonIgnore

0 commit comments

Comments
 (0)