-
Notifications
You must be signed in to change notification settings - Fork 305
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
raise error for empty violation store and delete empty rule file #1405
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
/* | ||
* Copyright 2014-2025 TNG Technology Consulting GmbH | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
package com.tngtech.archunit.library.freeze; | ||
|
||
class StoreEmptyException extends RuntimeException { | ||
StoreEmptyException(String message) { | ||
super(message); | ||
} | ||
|
||
} |
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -73,11 +73,17 @@ public final class TextFileBasedViolationStore implements ViolationStore { | |||||
private static final String ALLOW_STORE_CREATION_DEFAULT = "false"; | ||||||
private static final String ALLOW_STORE_UPDATE_PROPERTY_NAME = "default.allowStoreUpdate"; | ||||||
private static final String ALLOW_STORE_UPDATE_DEFAULT = "true"; | ||||||
private static final String DELETE_EMPTY_RULE_VIOLATION_PROPERTY_NAME = "default.deleteEmptyRuleViolation"; | ||||||
private static final String DELETE_EMPTY_RULE_VIOLATION_DEFAULT = "false"; | ||||||
private static final String WARN_EMPTY_RULE_VIOLATION_PROPERTY_NAME = "default.warnEmptyRuleViolation"; | ||||||
private static final String WARN_EMPTY_RULE_VIOLATION_DEFAULT = "false"; | ||||||
|
||||||
private final RuleViolationFileNameStrategy ruleViolationFileNameStrategy; | ||||||
|
||||||
private boolean storeCreationAllowed; | ||||||
private boolean storeUpdateAllowed; | ||||||
private boolean deleteEmptyRule; | ||||||
private boolean warnEmptyRuleViolation; | ||||||
private File storeFolder; | ||||||
private FileSyncedProperties storedRules; | ||||||
|
||||||
|
@@ -103,6 +109,8 @@ public TextFileBasedViolationStore(RuleViolationFileNameStrategy ruleViolationFi | |||||
public void initialize(Properties properties) { | ||||||
storeCreationAllowed = Boolean.parseBoolean(properties.getProperty(ALLOW_STORE_CREATION_PROPERTY_NAME, ALLOW_STORE_CREATION_DEFAULT)); | ||||||
storeUpdateAllowed = Boolean.parseBoolean(properties.getProperty(ALLOW_STORE_UPDATE_PROPERTY_NAME, ALLOW_STORE_UPDATE_DEFAULT)); | ||||||
deleteEmptyRule = Boolean.parseBoolean(properties.getProperty(DELETE_EMPTY_RULE_VIOLATION_PROPERTY_NAME, DELETE_EMPTY_RULE_VIOLATION_DEFAULT)); | ||||||
warnEmptyRuleViolation = Boolean.parseBoolean(properties.getProperty(WARN_EMPTY_RULE_VIOLATION_PROPERTY_NAME, WARN_EMPTY_RULE_VIOLATION_DEFAULT)); | ||||||
String path = properties.getProperty(STORE_PATH_PROPERTY_NAME, STORE_PATH_DEFAULT); | ||||||
storeFolder = new File(path); | ||||||
ensureExistence(storeFolder); | ||||||
|
@@ -140,15 +148,38 @@ public boolean contains(ArchRule rule) { | |||||
@Override | ||||||
public void save(ArchRule rule, List<String> violations) { | ||||||
log.trace("Storing evaluated rule '{}' with {} violations: {}", rule.getDescription(), violations.size(), violations); | ||||||
if (violations.isEmpty() && warnEmptyRuleViolation) { | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this check has to be placed here at the top, because for empty frozen rule violations you don't necessarily need to update the store. By seeing such warning the developer could change the test to non-freezing rather than decide to update the store. |
||||||
throw new StoreEmptyException(String.format("Saving empty violations for freezing rule is disabled (enable by configuration %s.%s=true)", | ||||||
ViolationStoreFactory.FREEZE_STORE_PROPERTY_NAME, WARN_EMPTY_RULE_VIOLATION_PROPERTY_NAME)); | ||||||
} | ||||||
if (violations.isEmpty() && deleteEmptyRule && !contains(rule)) { | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. another way to write this check would be
Suggested change
where |
||||||
// do nothing, new rule file should not be created | ||||||
return; | ||||||
} | ||||||
if (!storeUpdateAllowed) { | ||||||
throw new StoreUpdateFailedException(String.format( | ||||||
"Updating frozen violations is disabled (enable by configuration %s.%s=true)", | ||||||
ViolationStoreFactory.FREEZE_STORE_PROPERTY_NAME, ALLOW_STORE_UPDATE_PROPERTY_NAME)); | ||||||
} | ||||||
if (violations.isEmpty() && deleteEmptyRule) { | ||||||
deleteRuleFile(rule); | ||||||
return; | ||||||
} | ||||||
|
||||||
String ruleFileName = ensureRuleFileName(rule); | ||||||
write(violations, new File(storeFolder, ruleFileName)); | ||||||
} | ||||||
|
||||||
private void deleteRuleFile(ArchRule rule) { | ||||||
try { | ||||||
String ruleFileName = storedRules.getProperty(rule.getDescription()); | ||||||
Files.delete(storeFolder.toPath().resolve(ruleFileName)); | ||||||
} catch (IOException e) { | ||||||
throw new StoreUpdateFailedException(e); | ||||||
} | ||||||
storedRules.removeProperty(rule.getDescription()); | ||||||
} | ||||||
|
||||||
private void write(List<String> violations, File ruleDetails) { | ||||||
StringBuilder builder = new StringBuilder(); | ||||||
for (String violation : violations) { | ||||||
|
@@ -255,6 +286,11 @@ void setProperty(String propertyName, String value) { | |||||
syncFileSystem(); | ||||||
} | ||||||
|
||||||
void removeProperty(String propertyName) { | ||||||
loadedProperties.remove(ensureUnixLineBreaks(propertyName)); | ||||||
syncFileSystem(); | ||||||
} | ||||||
|
||||||
private void syncFileSystem() { | ||||||
try (FileOutputStream outputStream = new FileOutputStream(propertiesFile)) { | ||||||
loadedProperties.store(outputStream, ""); | ||||||
|
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.
we can discuss the above default value. I would prefer to have default
true
here, but I'd like to first hear the opinions from the maintainers.