-
Notifications
You must be signed in to change notification settings - Fork 0
Issue #34 Implement Refined JUL Logging Strategy with ERROR/PERFORMAN… #36
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -52,7 +52,7 @@ public sealed interface JsonSchema | |
| JsonSchema.NotSchema, | ||
| JsonSchema.RootRef { | ||
|
|
||
| Logger LOG = Logger.getLogger(JsonSchema.class.getName()); | ||
| Logger LOGGER = Logger.getLogger(JsonSchema.class.getName()); | ||
|
|
||
| /// Prevents external implementations, ensuring all schema types are inner records | ||
| enum Nothing implements JsonSchema { | ||
|
|
@@ -69,10 +69,15 @@ public ValidationResult validateAt(String path, JsonValue json, Deque<Validation | |
| /// @param schemaJson JSON Schema document as JsonValue | ||
| /// @return Immutable JsonSchema instance | ||
| /// @throws IllegalArgumentException if schema is invalid | ||
| static JsonSchema compile(JsonValue schemaJson) { | ||
| Objects.requireNonNull(schemaJson, "schemaJson"); | ||
| return SchemaCompiler.compile(schemaJson); | ||
| } | ||
| static JsonSchema compile(JsonValue schemaJson) { | ||
| Objects.requireNonNull(schemaJson, "schemaJson"); | ||
| try { | ||
| return SchemaCompiler.compile(schemaJson); | ||
| } catch (IllegalArgumentException e) { | ||
| LOGGER.severe(() -> "ERROR: Failed to compile JSON schema: " + e.getMessage()); | ||
| throw e; | ||
| } | ||
| } | ||
|
|
||
| /// Validates JSON document against this schema | ||
| /// | ||
|
|
@@ -84,15 +89,30 @@ default ValidationResult validate(JsonValue json) { | |
| Deque<ValidationFrame> stack = new ArrayDeque<>(); | ||
| stack.push(new ValidationFrame("", this, json)); | ||
|
|
||
| final int stackDepthWarningThreshold = 1000; | ||
| final java.util.concurrent.atomic.AtomicInteger maxStackDepth = new java.util.concurrent.atomic.AtomicInteger(0); | ||
|
|
||
| while (!stack.isEmpty()) { | ||
| ValidationFrame frame = stack.pop(); | ||
| LOG.finest(() -> "POP " + frame.path() + | ||
| int currentStackSize = stack.size(); | ||
| maxStackDepth.updateAndGet(current -> Math.max(current, currentStackSize)); | ||
|
Comment on lines
+97
to
+98
|
||
|
|
||
| if (currentStackSize > stackDepthWarningThreshold) { | ||
| LOGGER.fine(() -> "PERFORMANCE WARNING: Validation stack depth exceeds recommended threshold: " + currentStackSize); | ||
|
Comment on lines
+94
to
+101
|
||
| } | ||
|
|
||
| LOGGER.finest(() -> "POP " + frame.path() + | ||
| " schema=" + frame.schema().getClass().getSimpleName()); | ||
| ValidationResult result = frame.schema.validateAt(frame.path, frame.json, stack); | ||
| if (!result.valid()) { | ||
| errors.addAll(result.errors()); | ||
| } | ||
| } | ||
|
|
||
| final int finalMaxStackDepth = maxStackDepth.get(); | ||
| if (finalMaxStackDepth > 100) { | ||
| LOGGER.fine(() -> "PERFORMANCE WARNING: Maximum validation stack depth reached: " + finalMaxStackDepth); | ||
| } | ||
|
Comment on lines
+112
to
+115
|
||
|
|
||
| return errors.isEmpty() ? ValidationResult.success() : ValidationResult.failure(errors); | ||
| } | ||
|
|
@@ -368,7 +388,7 @@ public ValidationResult validateAt(String path, JsonValue json, Deque<Validation | |
| Deque<ValidationFrame> branchStack = new ArrayDeque<>(); | ||
| List<ValidationError> branchErrors = new ArrayList<>(); | ||
|
|
||
| LOG.finest(() -> "BRANCH START: " + schema.getClass().getSimpleName()); | ||
| LOGGER.finest(() -> "BRANCH START: " + schema.getClass().getSimpleName()); | ||
| branchStack.push(new ValidationFrame(path, schema, json)); | ||
|
|
||
| while (!branchStack.isEmpty()) { | ||
|
|
@@ -384,7 +404,7 @@ public ValidationResult validateAt(String path, JsonValue json, Deque<Validation | |
| break; | ||
| } | ||
| collected.addAll(branchErrors); | ||
| LOG.finest(() -> "BRANCH END: " + branchErrors.size() + " errors"); | ||
| LOGGER.finest(() -> "BRANCH END: " + branchErrors.size() + " errors"); | ||
| } | ||
|
|
||
| return anyValid ? ValidationResult.success() : ValidationResult.failure(collected); | ||
|
|
@@ -401,7 +421,7 @@ public ValidationResult validateAt(String path, JsonValue json, Deque<Validation | |
| // Step 2 - choose branch | ||
| JsonSchema branch = ifResult.valid() ? thenSchema : elseSchema; | ||
|
|
||
| LOG.finer(() -> String.format( | ||
| LOGGER.finer(() -> String.format( | ||
| "Conditional path=%s ifValid=%b branch=%s", | ||
| path, ifResult.valid(), | ||
| branch == null ? "none" : (ifResult.valid() ? "then" : "else"))); | ||
|
|
@@ -439,8 +459,8 @@ final class SchemaCompiler { | |
| private static JsonSchema currentRootSchema; | ||
|
|
||
| private static void trace(String stage, JsonValue fragment) { | ||
| if (LOG.isLoggable(Level.FINER)) { | ||
| LOG.finer(() -> | ||
| if (LOGGER.isLoggable(Level.FINER)) { | ||
| LOGGER.finer(() -> | ||
| String.format("[%s] %s", stage, fragment.toString())); | ||
| } | ||
| } | ||
|
|
@@ -460,6 +480,7 @@ private static JsonSchema compileInternal(JsonValue schemaJson) { | |
| } | ||
|
|
||
| if (!(schemaJson instanceof JsonObject obj)) { | ||
| LOGGER.severe(() -> "ERROR: Schema must be an object or boolean, got: " + schemaJson.getClass().getSimpleName()); | ||
| throw new IllegalArgumentException("Schema must be an object or boolean"); | ||
| } | ||
|
|
||
|
|
@@ -483,6 +504,7 @@ private static JsonSchema compileInternal(JsonValue schemaJson) { | |
| } | ||
| JsonSchema resolved = definitions.get(ref); | ||
| if (resolved == null) { | ||
| LOGGER.severe(() -> "ERROR: Unresolved $ref: " + ref); | ||
| throw new IllegalArgumentException("Unresolved $ref: " + ref); | ||
| } | ||
| return resolved; | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Using AtomicInteger for tracking stack depth introduces unnecessary atomic operations overhead in single-threaded validation. Consider using a simple int variable instead since validation is not performed concurrently.