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

CLDR-13750 Refactoring collection utilities (part 3, matchers) #460

Merged
merged 1 commit into from
May 31, 2020
Merged

CLDR-13750 Refactoring collection utilities (part 3, matchers) #460

merged 1 commit into from
May 31, 2020

Conversation

hagbard
Copy link
Contributor

@hagbard hagbard commented May 10, 2020

Replace CollectionUtilities.ObjectMatcher with JDK Predicate and handle subclasses (e.g. RegexMatcher). Note that some of the other matchers in CheckAttributeValues can now probably be simplified to inlinable lambdas (which I'd happily do in a future PR).

This PR is a single commit, current stacked on other parts, so please only look at the most recent commit.

Checklist

@hagbard hagbard requested a review from macchiati May 10, 2020 19:10
@jira-pull-request-webhook
Copy link

Notice: the branch changed across the force-push!

  • tools/cldr-unittest/src/org/unicode/cldr/unittest/CheckYear.java is no longer changed in the branch
  • tools/cldr-unittest/src/org/unicode/cldr/unittest/DataDrivenTestHelper.java is no longer changed in the branch
  • tools/cldr-unittest/src/org/unicode/cldr/unittest/TestAlt.java is no longer changed in the branch
  • tools/cldr-unittest/src/org/unicode/cldr/unittest/TestAnnotations.java is no longer changed in the branch
  • tools/cldr-unittest/src/org/unicode/cldr/unittest/TestAttributeValues.java is no longer changed in the branch
  • tools/cldr-unittest/src/org/unicode/cldr/unittest/TestBasic.java is no longer changed in the branch
  • tools/cldr-unittest/src/org/unicode/cldr/unittest/TestCldrFactory.java is no longer changed in the branch
  • tools/cldr-unittest/src/org/unicode/cldr/unittest/TestCLDRLocaleCoverage.java is no longer changed in the branch
  • tools/cldr-unittest/src/org/unicode/cldr/unittest/TestCoverageLevel.java is no longer changed in the branch
  • tools/cldr-unittest/src/org/unicode/cldr/unittest/TestDtdData.java is no longer changed in the branch
  • tools/cldr-unittest/src/org/unicode/cldr/unittest/TestExampleDependencies.java is no longer changed in the branch
  • tools/cldr-unittest/src/org/unicode/cldr/unittest/TestExampleGenerator.java is no longer changed in the branch
  • tools/cldr-unittest/src/org/unicode/cldr/unittest/TestFmwkPlus.java is no longer changed in the branch
  • tools/cldr-unittest/src/org/unicode/cldr/unittest/TestInheritance.java is no longer changed in the branch
  • tools/cldr-unittest/src/org/unicode/cldr/unittest/TestLocale.java is no longer changed in the branch
  • tools/cldr-unittest/src/org/unicode/cldr/unittest/TestPathHeader.java is no longer changed in the branch
  • tools/cldr-unittest/src/org/unicode/cldr/unittest/TestPaths.java is no longer changed in the branch
  • tools/cldr-unittest/src/org/unicode/cldr/unittest/TestPerf.java is no longer changed in the branch
  • tools/cldr-unittest/src/org/unicode/cldr/unittest/TestScriptMetadata.java is no longer changed in the branch
  • tools/cldr-unittest/src/org/unicode/cldr/unittest/TestSupplementalInfo.java is no longer changed in the branch
  • tools/cldr-unittest/src/org/unicode/cldr/unittest/TestTransforms.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/draft/GenerateLanguageData.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/draft/Keyboard.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/draft/Misc.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/draft/ScriptMetadata.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/draft/XLocaleDistance.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/icu/CheckIBMCoverage.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/json/Ldml2JsonConverter.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/test/CheckConsistentCasing.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/test/CheckDates.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/tool/ChartAnnotations.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/tool/ChartCollation.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/tool/ChartDelta.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/tool/ChartDtdDelta.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/tool/ChartLanguageMatching.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/tool/ChartSubdivisions.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/tool/CheckHtmlFiles.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/tool/CLDRCompare.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/tool/CLDRFormat.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/tool/CLDRModify.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/tool/CompareEn.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/tool/ConvertLanguageData.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/tool/CountItems.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/tool/DiffCldr.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/tool/FindPreferredHours.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/tool/GenerateBcp47Text.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/tool/GenerateCasingChart.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/tool/GenerateComparison.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/tool/GeneratedPluralSamples.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/tool/GenerateEnums.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/tool/GenerateItemCounts.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/tool/GenerateLanguageContainment.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/tool/GenerateMaximalLocales.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/tool/GeneratePluralRanges.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/tool/GenerateScriptMetadata.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/tool/GenerateXMB.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/tool/ListCoverageLevels.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/tool/LocaleReplacements.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/tool/MinimizeRegex.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/tool/Option.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/tool/SearchCLDR.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/tool/ShowChildren.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/tool/ShowData.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/tool/ShowDtdDiffs.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/tool/ShowKeyboards.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/tool/ShowLanguages.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/tool/ShowLocaleCoverage.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/tool/ShowPathHeaderDescriptions.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/tool/ShowPlurals.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/tool/ShowStarredCoverage.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/tool/SubdivisionNode.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/tool/WritePluralRules.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/util/Annotations.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/util/CLDRFile.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/util/DtdData.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/util/DtdDataCheck.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/util/IsoRegionData.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/util/LanguageGroup.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/util/LanguageTagParser.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/util/MatchValue.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/util/PathHeader.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/util/PathStarrer.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/util/PluralSnapshot.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/util/PreferredAndAllowedHour.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/util/props/ICUPropertyFactory.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/util/SupplementalDataInfo.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/util/TestUtilities.java is no longer changed in the branch
  • tools/java/org/unicode/cldr/util/Unlocode.java is no longer changed in the branch

View Diff Across Force-Push

~ Your Friendly Jira-GitHub PR Checker Bot

@hagbard
Copy link
Contributor Author

hagbard commented May 28, 2020

Rebased and ready for approval. This is very focussed and just migrates all the ObjectMatcher use to JDK's Predicte.

@hagbard hagbard merged commit 619c7ba into unicode-org:master May 31, 2020
@hagbard hagbard deleted the refactoring_3 branch June 3, 2020 20:19
This was referenced Apr 7, 2022
Open
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@macchiati macchiati macchiati approved these changes

Assignees
No one assigned
Labels
in-production no-effect-on-production
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@hagbard @macchiati @btangmu