Skip to content

Renaming changes #11683

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

Merged
sima-zhu merged 7 commits into from
Jun 3, 2020
Merged

Renaming changes #11683

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d717549
Address API review feedback
sima-zhu Jun 1, 2020
88409bb
Merge branch 'master' of https://github.com/Azure/azure-sdk-for-java …
sima-zhu Jun 1, 2020
3601e31
Fixed the service method
sima-zhu Jun 1, 2020
a25335c
Merge branch 'master' of https://github.com/Azure/azure-sdk-for-java …
sima-zhu Jun 2, 2020
abc1016
Renaming on boolean field and request id
sima-zhu Jun 2, 2020
4a3aa84
Fixed naming on prural
sima-zhu Jun 2, 2020
d3406cf
Revert varargs changes
sima-zhu Jun 2, 2020
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
8 changes: 4 additions & 4 deletions .../com/azure/search/documents/implementation/converters/CommonGramTokenFilterConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ public static CommonGramTokenFilter map(com.azure.search.documents.indexes.imple
commonGramTokenFilter.setName(name);

Boolean ignoreCase = obj.isIgnoreCase();
commonGramTokenFilter.setIgnoreCase(ignoreCase);
commonGramTokenFilter.setCaseIgnored(ignoreCase);

Boolean useQueryMode = obj.isUseQueryMode();
commonGramTokenFilter.setUseQueryMode(useQueryMode);
commonGramTokenFilter.setQueryModeUsed(useQueryMode);

if (obj.getCommonWords() != null) {
List<String> commonWords = new ArrayList<>(obj.getCommonWords());
Expand All @@ -53,10 +53,10 @@ public static com.azure.search.documents.indexes.implementation.models.CommonGra
String name = obj.getName();
commonGramTokenFilter.setName(name);

Boolean ignoreCase = obj.isIgnoreCase();
Boolean ignoreCase = obj.isCaseIgnored();
commonGramTokenFilter.setIgnoreCase(ignoreCase);

Boolean useQueryMode = obj.isUseQueryMode();
Boolean useQueryMode = obj.isQueryModeUsed();
commonGramTokenFilter.setUseQueryMode(useQueryMode);

if (obj.getCommonWords() != null) {
Expand Down
4 changes: 2 additions & 2 deletions ...earch/documents/implementation/converters/DictionaryDecompounderTokenFilterConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public static DictionaryDecompounderTokenFilter map(com.azure.search.documents.i
dictionaryDecompounderTokenFilter.setMinSubwordSize(minSubwordSize);

Boolean onlyLongestMatch = obj.isOnlyLongestMatch();
dictionaryDecompounderTokenFilter.setOnlyLongestMatch(onlyLongestMatch);
dictionaryDecompounderTokenFilter.setOnlyLongestMatched(onlyLongestMatch);

Integer maxSubwordSize = obj.getMaxSubwordSize();
dictionaryDecompounderTokenFilter.setMaxSubwordSize(maxSubwordSize);
Expand Down Expand Up @@ -61,7 +61,7 @@ public static com.azure.search.documents.indexes.implementation.models.Dictionar
Integer minSubwordSize = obj.getMinSubwordSize();
dictionaryDecompounderTokenFilter.setMinSubwordSize(minSubwordSize);

Boolean onlyLongestMatch = obj.isOnlyLongestMatch();
Boolean onlyLongestMatch = obj.isOnlyLongestMatched();
dictionaryDecompounderTokenFilter.setOnlyLongestMatch(onlyLongestMatch);

Integer maxSubwordSize = obj.getMaxSubwordSize();
Expand Down
4 changes: 2 additions & 2 deletions ...com/azure/search/documents/implementation/converters/EntityRecognitionSkillConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public static EntityRecognitionSkill map(com.azure.search.documents.indexes.impl
entityRecognitionSkill.setDescription(description);

Boolean includeTypelessEntities = obj.isIncludeTypelessEntities();
entityRecognitionSkill.setIncludeTypelessEntities(includeTypelessEntities);
entityRecognitionSkill.setTypelessEntitiesIncluded(includeTypelessEntities);

if (obj.getDefaultLanguageCode() != null) {
EntityRecognitionSkillLanguage defaultLanguageCode =
Expand Down Expand Up @@ -100,7 +100,7 @@ public static com.azure.search.documents.indexes.implementation.models.EntityRec
String description = obj.getDescription();
entityRecognitionSkill.setDescription(description);

Boolean includeTypelessEntities = obj.isIncludeTypelessEntities();
Boolean includeTypelessEntities = obj.isTypelessEntitiesIncluded();
Comment thread
alzimmermsft marked this conversation as resolved.
Outdated
entityRecognitionSkill.setIncludeTypelessEntities(includeTypelessEntities);

if (obj.getDefaultLanguageCode() != null) {
Expand Down
4 changes: 2 additions & 2 deletions ...m/azure/search/documents/implementation/converters/KeywordMarkerTokenFilterConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public static KeywordMarkerTokenFilter map(com.azure.search.documents.indexes.im
}

Boolean ignoreCase = obj.isIgnoreCase();
keywordMarkerTokenFilter.setIgnoreCase(ignoreCase);
keywordMarkerTokenFilter.setCaseIgnored(ignoreCase);
return keywordMarkerTokenFilter;
}

Expand All @@ -55,7 +55,7 @@ public static com.azure.search.documents.indexes.implementation.models.KeywordMa
keywordMarkerTokenFilter.setKeywords(keywords);
}

Boolean ignoreCase = obj.isIgnoreCase();
Boolean ignoreCase = obj.isCaseIgnored();
keywordMarkerTokenFilter.setIgnoreCase(ignoreCase);
return keywordMarkerTokenFilter;
}
Expand Down
4 changes: 2 additions & 2 deletions .../java/com/azure/search/documents/implementation/converters/LimitTokenFilterConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public static LimitTokenFilter map(com.azure.search.documents.indexes.implementa
limitTokenFilter.setMaxTokenCount(maxTokenCount);

Boolean consumeAllTokens = obj.isConsumeAllTokens();
limitTokenFilter.setConsumeAllTokens(consumeAllTokens);
limitTokenFilter.setAllTokensConsumed(consumeAllTokens);
return limitTokenFilter;
}

Expand All @@ -46,7 +46,7 @@ public static com.azure.search.documents.indexes.implementation.models.LimitToke
Integer maxTokenCount = obj.getMaxTokenCount();
limitTokenFilter.setMaxTokenCount(maxTokenCount);

Boolean consumeAllTokens = obj.isConsumeAllTokens();
Boolean consumeAllTokens = obj.isAllTokensConsumed();
Comment thread
alzimmermsft marked this conversation as resolved.
Outdated
limitTokenFilter.setConsumeAllTokens(consumeAllTokens);
return limitTokenFilter;
}
Expand Down
2 changes: 1 addition & 1 deletion ...arch/documents/implementation/converters/MicrosoftLanguageStemmingTokenizerConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public static MicrosoftLanguageStemmingTokenizer map(com.azure.search.documents.
}

Boolean isSearchTokenizer = obj.isSearchTokenizer();
microsoftLanguageStemmingTokenizer.setIsSearchTokenizer(isSearchTokenizer);
microsoftLanguageStemmingTokenizer.setIsSearchTokenizerUsed(isSearchTokenizer);
return microsoftLanguageStemmingTokenizer;
}

Expand Down
4 changes: 2 additions & 2 deletions ...src/main/java/com/azure/search/documents/implementation/converters/OcrSkillConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public static OcrSkill map(com.azure.search.documents.indexes.implementation.mod
}

Boolean shouldDetectOrientation = obj.isShouldDetectOrientation();
ocrSkill.shouldDetectOrientation(shouldDetectOrientation);
ocrSkill.setShouldDetectOrientation(shouldDetectOrientation);
return ocrSkill;
}

Expand Down Expand Up @@ -93,7 +93,7 @@ public static com.azure.search.documents.indexes.implementation.models.OcrSkill
ocrSkill.setDefaultLanguageCode(defaultLanguageCode);
}

Boolean shouldDetectOrientation = obj.shouldDetectOrientation();
Boolean shouldDetectOrientation = obj.setShouldDetectOrientation();
ocrSkill.setShouldDetectOrientation(shouldDetectOrientation);
return ocrSkill;
}
Expand Down
4 changes: 2 additions & 2 deletions ...com/azure/search/documents/implementation/converters/PathHierarchyTokenizerConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public static PathHierarchyTokenizer map(com.azure.search.documents.indexes.impl
pathHierarchyTokenizer.setDelimiter(delimiter);

Boolean reverseTokenOrder = obj.isReverseTokenOrder();
pathHierarchyTokenizer.setReverseTokenOrder(reverseTokenOrder);
pathHierarchyTokenizer.setTokenOrderReversed(reverseTokenOrder);

Integer numberOfTokensToSkip = obj.getNumberOfTokensToSkip();
pathHierarchyTokenizer.setNumberOfTokensToSkip(numberOfTokensToSkip);
Expand Down Expand Up @@ -60,7 +60,7 @@ public static com.azure.search.documents.indexes.implementation.models.PathHiera
String delimiter = obj.getDelimiter();
pathHierarchyTokenizerV2.setDelimiter(delimiter);

Boolean reverseTokenOrder = obj.isReverseTokenOrder();
Boolean reverseTokenOrder = obj.isTokenOrderReversed();
pathHierarchyTokenizerV2.setReverseTokenOrder(reverseTokenOrder);

Integer numberOfTokensToSkip = obj.getNumberOfTokensToSkip();
Expand Down
4 changes: 2 additions & 2 deletions ...va/com/azure/search/documents/implementation/converters/PhoneticTokenFilterConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public static PhoneticTokenFilter map(com.azure.search.documents.indexes.impleme
String name = obj.getName();
phoneticTokenFilter.setName(name);

Boolean replaceOriginalTokens = obj.isReplaceOriginalTokens();
Boolean replaceOriginalTokens = obj.isOriginalTokensReplaced();
Comment thread
alzimmermsft marked this conversation as resolved.
Outdated
phoneticTokenFilter.setReplaceOriginalTokens(replaceOriginalTokens);

if (obj.getEncoder() != null) {
Expand All @@ -49,7 +49,7 @@ public static com.azure.search.documents.indexes.implementation.models.PhoneticT
phoneticTokenFilter.setName(name);

Boolean replaceOriginalTokens = obj.isReplaceOriginalTokens();
phoneticTokenFilter.setReplaceOriginalTokens(replaceOriginalTokens);
phoneticTokenFilter.setOriginalTokensReplaced(replaceOriginalTokens);

if (obj.getEncoder() != null) {
com.azure.search.documents.indexes.implementation.models.PhoneticEncoder encoder =
Expand Down
4 changes: 2 additions & 2 deletions ...in/java/com/azure/search/documents/implementation/converters/RequestOptionsConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public static RequestOptions map(com.azure.search.documents.implementation.model
RequestOptions requestOptions = new RequestOptions();

UUID xMsClientRequestId = obj.getXMsClientRequestId();
requestOptions.setXMsClientRequestId(xMsClientRequestId);
requestOptions.setClientRequestId(xMsClientRequestId);
return requestOptions;
}

Expand All @@ -36,7 +36,7 @@ public static com.azure.search.documents.implementation.models.RequestOptions ma
com.azure.search.documents.implementation.models.RequestOptions requestOptions =
new com.azure.search.documents.implementation.models.RequestOptions();

UUID xMsClientRequestId = obj.getXMsClientRequestId();
UUID xMsClientRequestId = obj.getClientRequestId();
requestOptions.setXMsClientRequestId(xMsClientRequestId);
return requestOptions;
}
Expand Down
4 changes: 2 additions & 2 deletions .../com/azure/search/documents/implementation/converters/RequestOptionsIndexesConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public static RequestOptions map(com.azure.search.documents.indexes.implementati
RequestOptions requestOptions = new RequestOptions();

UUID xMsClientRequestId = obj.getXMsClientRequestId();
requestOptions.setXMsClientRequestId(xMsClientRequestId);
requestOptions.setClientRequestId(xMsClientRequestId);
return requestOptions;
}

Expand All @@ -32,7 +32,7 @@ public static com.azure.search.documents.indexes.implementation.models.RequestOp
com.azure.search.documents.indexes.implementation.models.RequestOptions requestOptions =
new com.azure.search.documents.indexes.implementation.models.RequestOptions();

UUID xMsClientRequestId = obj.getXMsClientRequestId();
UUID xMsClientRequestId = obj.getClientRequestId();
requestOptions.setXMsClientRequestId(xMsClientRequestId);
return requestOptions;
}
Expand Down
8 changes: 4 additions & 4 deletions ...a/com/azure/search/documents/implementation/converters/StopwordsTokenFilterConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ public static StopwordsTokenFilter map(com.azure.search.documents.indexes.implem
stopwordsTokenFilter.setName(name);

Boolean removeTrailingStopWords = obj.isRemoveTrailingStopWords();
stopwordsTokenFilter.setRemoveTrailingStopWords(removeTrailingStopWords);
stopwordsTokenFilter.setTrailingStopWordsRemoved(removeTrailingStopWords);

Boolean ignoreCase = obj.isIgnoreCase();
stopwordsTokenFilter.setIgnoreCase(ignoreCase);
stopwordsTokenFilter.setCaseIgnored(ignoreCase);

if (obj.getStopwords() != null) {
List<String> stopwords = new ArrayList<>(obj.getStopwords());
Expand Down Expand Up @@ -59,10 +59,10 @@ public static com.azure.search.documents.indexes.implementation.models.Stopwords
String name = obj.getName();
stopwordsTokenFilter.setName(name);

Boolean removeTrailingStopWords = obj.isRemoveTrailingStopWords();
Boolean removeTrailingStopWords = obj.isTrailingStopWordsRemoved();
Comment thread
alzimmermsft marked this conversation as resolved.
Outdated
stopwordsTokenFilter.setRemoveTrailingStopWords(removeTrailingStopWords);

Boolean ignoreCase = obj.isIgnoreCase();
Boolean ignoreCase = obj.isCaseIgnored();
stopwordsTokenFilter.setIgnoreCase(ignoreCase);

if (obj.getStopwords() != null) {
Expand Down
4 changes: 2 additions & 2 deletions ...ava/com/azure/search/documents/implementation/converters/SynonymTokenFilterConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public static SynonymTokenFilter map(com.azure.search.documents.indexes.implemen
}

Boolean ignoreCase = obj.isIgnoreCase();
synonymTokenFilter.setIgnoreCase(ignoreCase);
synonymTokenFilter.setCaseIgnored(ignoreCase);
return synonymTokenFilter;
}

Expand All @@ -61,7 +61,7 @@ public static com.azure.search.documents.indexes.implementation.models.SynonymTo
synonymTokenFilter.setSynonyms(synonyms);
}

Boolean ignoreCase = obj.isIgnoreCase();
Boolean ignoreCase = obj.isCaseIgnored();
synonymTokenFilter.setIgnoreCase(ignoreCase);
return synonymTokenFilter;
}
Expand Down
10 changes: 5 additions & 5 deletions ...m/azure/search/documents/implementation/converters/WordDelimiterTokenFilterConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public static WordDelimiterTokenFilter map(com.azure.search.documents.indexes.im
wordDelimiterTokenFilter.setName(name);

Boolean catenateNumbers = obj.isCatenateNumbers();
wordDelimiterTokenFilter.setCatenateNumbers(catenateNumbers);
wordDelimiterTokenFilter.setNumbersCatenated(catenateNumbers);

if (obj.getProtectedWords() != null) {
List<String> protectedWords = new ArrayList<>(obj.getProtectedWords());
Expand Down Expand Up @@ -56,7 +56,7 @@ public static WordDelimiterTokenFilter map(com.azure.search.documents.indexes.im
wordDelimiterTokenFilter.setCatenateAll(catenateAll);

Boolean catenateWords = obj.isCatenateWords();
wordDelimiterTokenFilter.setCatenateWords(catenateWords);
wordDelimiterTokenFilter.setWordsCatenated(catenateWords);
return wordDelimiterTokenFilter;
}

Expand All @@ -74,7 +74,7 @@ public static com.azure.search.documents.indexes.implementation.models.WordDelim
String name = obj.getName();
wordDelimiterTokenFilter.setName(name);

Boolean catenateNumbers = obj.isCatenateNumbers();
Boolean catenateNumbers = obj.isNumbersCatenated();
Comment thread
alzimmermsft marked this conversation as resolved.
Outdated
wordDelimiterTokenFilter.setCatenateNumbers(catenateNumbers);

if (obj.getProtectedWords() != null) {
Expand All @@ -100,10 +100,10 @@ public static com.azure.search.documents.indexes.implementation.models.WordDelim
Boolean preserveOriginal = obj.isPreserveOriginal();
wordDelimiterTokenFilter.setPreserveOriginal(preserveOriginal);

Boolean catenateAll = obj.isCatenateAll();
Boolean catenateAll = obj.catenateAll();
wordDelimiterTokenFilter.setCatenateAll(catenateAll);

Boolean catenateWords = obj.isCatenateWords();
Boolean catenateWords = obj.isWordsCatenated();
Comment thread
alzimmermsft marked this conversation as resolved.
Outdated
wordDelimiterTokenFilter.setCatenateWords(catenateWords);
return wordDelimiterTokenFilter;
}
Expand Down
12 changes: 6 additions & 6 deletions ...in/java/com/azure/search/documents/indexes/implementation/models/PhoneticTokenFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public final class PhoneticTokenFilter extends TokenFilter {
* tokens. If false, encoded tokens are added as synonyms. Default is true.
*/
@JsonProperty(value = "replace")
private Boolean replaceOriginalTokens;
private Boolean originalTokensReplaced;
Comment thread
alzimmermsft marked this conversation as resolved.
Outdated

/**
* Get the encoder property: The phonetic encoder to use. Default is
Expand Down Expand Up @@ -68,20 +68,20 @@ public PhoneticTokenFilter setEncoder(PhoneticEncoder encoder) {
*
* @return the replaceOriginalTokens value.
*/
public Boolean isReplaceOriginalTokens() {
return this.replaceOriginalTokens;
public Boolean isOriginalTokensReplaced() {
return this.originalTokensReplaced;
}

/**
* Set the replaceOriginalTokens property: A value indicating whether
* encoded tokens should replace original tokens. If false, encoded tokens
* are added as synonyms. Default is true.
*
* @param replaceOriginalTokens the replaceOriginalTokens value to set.
* @param originalTokensReplaced the replaceOriginalTokens value to set.
* @return the PhoneticTokenFilter object itself.
*/
public PhoneticTokenFilter setReplaceOriginalTokens(Boolean replaceOriginalTokens) {
this.replaceOriginalTokens = replaceOriginalTokens;
public PhoneticTokenFilter setOriginalTokensReplaced(Boolean originalTokensReplaced) {
this.originalTokensReplaced = originalTokensReplaced;
return this;
}
}
24 changes: 12 additions & 12 deletions ...uments/src/main/java/com/azure/search/documents/indexes/models/CommonGramTokenFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public final class CommonGramTokenFilter extends TokenFilter {
* insensitive. Default is false.
*/
@JsonProperty(value = "ignoreCase")
private Boolean ignoreCase;
private Boolean caseIgnored;

/*
* A value that indicates whether the token filter is in query mode. When
Expand All @@ -38,7 +38,7 @@ public final class CommonGramTokenFilter extends TokenFilter {
* false.
*/
@JsonProperty(value = "queryMode")
private Boolean useQueryMode;
private Boolean queryModeUsed;

/**
* Get the commonWords property: The set of common words.
Expand Down Expand Up @@ -66,19 +66,19 @@ public CommonGramTokenFilter setCommonWords(List<String> commonWords) {
*
* @return the ignoreCase value.
*/
public Boolean isIgnoreCase() {
return this.ignoreCase;
public Boolean isCaseIgnored() {
return this.caseIgnored;
}

/**
* Set the ignoreCase property: A value indicating whether common words
* matching will be case insensitive. Default is false.
*
* @param ignoreCase the ignoreCase value to set.
* @param caseIgnored the ignoreCase value to set.
* @return the CommonGramTokenFilter object itself.
*/
public CommonGramTokenFilter setIgnoreCase(Boolean ignoreCase) {
this.ignoreCase = ignoreCase;
public CommonGramTokenFilter setCaseIgnored(Boolean caseIgnored) {
this.caseIgnored = caseIgnored;
return this;
}

Expand All @@ -90,8 +90,8 @@ public CommonGramTokenFilter setIgnoreCase(Boolean ignoreCase) {
*
* @return the useQueryMode value.
*/
public Boolean isUseQueryMode() {
return this.useQueryMode;
public Boolean isQueryModeUsed() {
return this.queryModeUsed;
}

/**
Expand All @@ -100,11 +100,11 @@ public Boolean isUseQueryMode() {
* bigrams and then removes common words and single terms followed by a
* common word. Default is false.
*
* @param useQueryMode the useQueryMode value to set.
* @param queryModeUsed the useQueryMode value to set.
* @return the CommonGramTokenFilter object itself.
*/
public CommonGramTokenFilter setUseQueryMode(Boolean useQueryMode) {
this.useQueryMode = useQueryMode;
public CommonGramTokenFilter setQueryModeUsed(Boolean queryModeUsed) {
this.queryModeUsed = queryModeUsed;
return this;
}
}
Loading