Skip to content
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.

Sign up for GitHub

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

Jump to bottom

HDDS-11149. Have a generic version Validator for validating Requests #6932

Draft
wants to merge 12 commits into
base: master
Choose a base branch
from
Draft

HDDS-11149. Have a generic version Validator for validating Requests #6932

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
bde95f7
HDDS-11149. Add a maximum client version in the RequestFeatureValidat…
swamirishi Jul 12, 2024
f1676be
HDDS-11149. Set conditions default value to {}
swamirishi Jul 12, 2024
b77d1bf
Merge remote-tracking branch 'origin/master' into HDDS-11149
adoroszlai Jul 12, 2024
561d010
HDDS-11149. Create Base validator for generic version validation
swamirishi Jul 15, 2024
363d9fa
Merge remote-tracking branch 'apache/master' into HEAD
swamirishi Jul 15, 2024
e623fdb
HDDS-11149. Add register validator processor
swamirishi Jul 15, 2024
b270bf6
HDDS-11149. Fix checkstyle
swamirishi Jul 15, 2024
ca3746d
HDDS-11149. Fix findbugs & rat failures
swamirishi Jul 17, 2024
a84749b
HDDS-11149. Move to enum maps
swamirishi Jul 18, 2024
fc57929
HDDS-11149. Move validation to ozone-common and fix docs
swamirishi Jul 19, 2024
778229a
HDDS-11149. Fix typo while extracting version
swamirishi Jul 29, 2024
9cf34be
HDDS-11149. Address review comments
swamirishi Aug 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/master' into HDDS-11149
  • Loading branch information
@adoroszlai
adoroszlai committed Jul 12, 2024
commit b77d1bf8cca1b1e16a369c6ea6c4c114edb5d26b
6 changes: 3 additions & 3 deletions ...anager/src/main/java/org/apache/hadoop/ozone/om/request/validation/ValidatorRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ void initMaps(Collection<Method> describedValidators) {
for (ValidationCondition condition : descriptor.conditions()) {
EnumMap<Type, EnumMap<RequestProcessingPhase, List<Method>>>
requestTypeMap = getAndInitialize(
condition, this::newTypeMap, validators);
condition, this::newTypeMap, validators);
EnumMap<RequestProcessingPhase, List<Method>> phases = getAndInitialize(
requestType, this::newPhaseMap, requestTypeMap);
if (isPreProcessValidator(descriptor)) {
Expand Down Expand Up @@ -251,8 +251,8 @@ private EnumMap<RequestProcessingPhase, List<Method>> newPhaseMap() {
return new EnumMap<>(RequestProcessingPhase.class);
}

private <K, V> V getAndInitialize(K key, Supplier<V> defaultValue, Map<K, V> from) {
return from.compute(key, (k, v) -> v == null ? defaultValue.get() : v);
private <K, V> V getAndInitialize(K key, Supplier<V> defaultSupplier, Map<K, V> from) {
return from.computeIfAbsent(key, k -> defaultSupplier.get());
}

private boolean isPreProcessValidator(RequestFeatureValidator descriptor) {
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.