Skip to content

Collapse models into single one. #11588

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 5 commits into from
May 29, 2020
Merged

Collapse models into single one. #11588

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
04bcd64
Collapse multiple versions into one.
sima-zhu May 29, 2020
e11404d
Fixed compile issues
sima-zhu May 29, 2020
ece84ad
Merge branch 'master' of https://github.com/Azure/azure-sdk-for-java …
sima-zhu May 29, 2020
0694094
Revert internal model changes
sima-zhu May 29, 2020
f111d36
Made change log changes
sima-zhu May 29, 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
14 changes: 7 additions & 7 deletions ...in/java/com/azure/search/documents/implementation/converters/BM25SimilarityConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@

package com.azure.search.documents.implementation.converters;

import com.azure.search.documents.indexes.models.BM25Similarity;
import com.azure.search.documents.indexes.models.BM25SimilarityAlgorithm;

/**
* A converter between {@link com.azure.search.documents.indexes.implementation.models.BM25Similarity} and
* {@link BM25Similarity}.
* {@link BM25SimilarityAlgorithm}.
*/
public final class BM25SimilarityConverter {
/**
* Maps from {@link com.azure.search.documents.indexes.implementation.models.BM25Similarity} to {@link BM25Similarity}.
* Maps from {@link com.azure.search.documents.indexes.implementation.models.BM25Similarity} to {@link BM25SimilarityAlgorithm}.
*/
public static BM25Similarity map(com.azure.search.documents.indexes.implementation.models.BM25Similarity obj) {
public static BM25SimilarityAlgorithm map(com.azure.search.documents.indexes.implementation.models.BM25Similarity obj) {
if (obj == null) {
return null;
}
BM25Similarity bM25Similarity = new BM25Similarity();
BM25SimilarityAlgorithm bM25Similarity = new BM25SimilarityAlgorithm();

Double b = obj.getB();
bM25Similarity.setB(b);
Expand All @@ -28,9 +28,9 @@ public static BM25Similarity map(com.azure.search.documents.indexes.implementati
}

/**
* Maps from {@link BM25Similarity} to {@link com.azure.search.documents.indexes.implementation.models.BM25Similarity}.
* Maps from {@link BM25SimilarityAlgorithm} to {@link com.azure.search.documents.indexes.implementation.models.BM25Similarity}.
*/
public static com.azure.search.documents.indexes.implementation.models.BM25Similarity map(BM25Similarity obj) {
public static com.azure.search.documents.indexes.implementation.models.BM25Similarity map(BM25SimilarityAlgorithm obj) {
if (obj == null) {
return null;
}
Expand Down
14 changes: 7 additions & 7 deletions ...java/com/azure/search/documents/implementation/converters/ClassicSimilarityConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,30 @@

package com.azure.search.documents.implementation.converters;

import com.azure.search.documents.indexes.models.ClassicSimilarity;
import com.azure.search.documents.indexes.models.ClassicSimilarityAlgorithm;

/**
* A converter between {@link com.azure.search.documents.indexes.implementation.models.ClassicSimilarity} and
* {@link ClassicSimilarity}.
* {@link ClassicSimilarityAlgorithm}.
*/
public final class ClassicSimilarityConverter {
/**
* Maps from {@link com.azure.search.documents.indexes.implementation.models.ClassicSimilarity} to
* {@link ClassicSimilarity}.
* {@link ClassicSimilarityAlgorithm}.
*/
public static ClassicSimilarity map(com.azure.search.documents.indexes.implementation.models.ClassicSimilarity obj) {
public static ClassicSimilarityAlgorithm map(com.azure.search.documents.indexes.implementation.models.ClassicSimilarity obj) {
if (obj == null) {
return null;
}
ClassicSimilarity classicSimilarity = new ClassicSimilarity();
ClassicSimilarityAlgorithm classicSimilarity = new ClassicSimilarityAlgorithm();
return classicSimilarity;
}

/**
* Maps from {@link ClassicSimilarity} to
* Maps from {@link ClassicSimilarityAlgorithm} to
* {@link com.azure.search.documents.indexes.implementation.models.ClassicSimilarity}.
*/
public static com.azure.search.documents.indexes.implementation.models.ClassicSimilarity map(ClassicSimilarity obj) {
public static com.azure.search.documents.indexes.implementation.models.ClassicSimilarity map(ClassicSimilarityAlgorithm obj) {
if (obj == null) {
return null;
}
Expand Down
34 changes: 30 additions & 4 deletions ...a/com/azure/search/documents/implementation/converters/EdgeNGramTokenFilterConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,42 @@ public static EdgeNGramTokenFilter map(com.azure.search.documents.indexes.implem
return edgeNGramTokenFilter;
}

/**
* Maps from {@link com.azure.search.documents.indexes.implementation.models.EdgeNGramTokenFilterV2} to
* {@link EdgeNGramTokenFilter}.
*/
public static EdgeNGramTokenFilter map(com.azure.search.documents.indexes.implementation.models.EdgeNGramTokenFilterV2 obj) {
if (obj == null) {
return null;
}
EdgeNGramTokenFilter edgeNGramTokenFilter = new EdgeNGramTokenFilter();

String name = obj.getName();
edgeNGramTokenFilter.setName(name);

Integer maxGram = obj.getMaxGram();
edgeNGramTokenFilter.setMaxGram(maxGram);

if (obj.getSide() != null) {
EdgeNGramTokenFilterSide side = EdgeNGramTokenFilterSideConverter.map(obj.getSide());
edgeNGramTokenFilter.setSide(side);
}

Integer minGram = obj.getMinGram();
edgeNGramTokenFilter.setMinGram(minGram);
return edgeNGramTokenFilter;
}

/**
* Maps from {@link EdgeNGramTokenFilter} to
* {@link com.azure.search.documents.indexes.implementation.models.EdgeNGramTokenFilter}.
* {@link com.azure.search.documents.indexes.implementation.models.EdgeNGramTokenFilterV2}.
*/
public static com.azure.search.documents.indexes.implementation.models.EdgeNGramTokenFilter map(EdgeNGramTokenFilter obj) {
public static com.azure.search.documents.indexes.implementation.models.EdgeNGramTokenFilterV2 map(EdgeNGramTokenFilter obj) {
if (obj == null) {
return null;
}
com.azure.search.documents.indexes.implementation.models.EdgeNGramTokenFilter edgeNGramTokenFilter =
new com.azure.search.documents.indexes.implementation.models.EdgeNGramTokenFilter();
com.azure.search.documents.indexes.implementation.models.EdgeNGramTokenFilterV2 edgeNGramTokenFilter =
new com.azure.search.documents.indexes.implementation.models.EdgeNGramTokenFilterV2();

String name = obj.getName();
edgeNGramTokenFilter.setName(name);
Expand Down
70 changes: 0 additions & 70 deletions ...com/azure/search/documents/implementation/converters/EdgeNGramTokenFilterV2Converter.java
View file
Open in desktop

This file was deleted.

40 changes: 30 additions & 10 deletions .../java/com/azure/search/documents/implementation/converters/KeywordTokenizerConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,15 @@
import com.azure.search.documents.indexes.models.KeywordTokenizer;

/**
* A converter between {@link com.azure.search.documents.indexes.implementation.models.KeywordTokenizer} and
* A converter between {@link com.azure.search.documents.indexes.implementation.models.KeywordTokenizerV2} and
* {@link KeywordTokenizer}.
*/
public final class KeywordTokenizerConverter {
/**
* Maps from {@link com.azure.search.documents.indexes.implementation.models.KeywordTokenizer} to {@link KeywordTokenizer}.
* Maps from {@link com.azure.search.documents.indexes.implementation.models.KeywordTokenizerV2} to
* {@link KeywordTokenizer}.
*/
public static KeywordTokenizer map(com.azure.search.documents.indexes.implementation.models.KeywordTokenizer obj) {
public static KeywordTokenizer map(com.azure.search.documents.indexes.implementation.models.KeywordTokenizerV2 obj) {
if (obj == null) {
return null;
}
Expand All @@ -22,29 +23,48 @@ public static KeywordTokenizer map(com.azure.search.documents.indexes.implementa
String name = obj.getName();
keywordTokenizer.setName(name);

Integer bufferSize = obj.getBufferSize();
keywordTokenizer.setBufferSize(bufferSize);
Integer maxTokenLength = obj.getMaxTokenLength();
keywordTokenizer.setMaxTokenLength(maxTokenLength);
return keywordTokenizer;
}

/**
* Maps from {@link KeywordTokenizer} to {@link com.azure.search.documents.indexes.implementation.models.KeywordTokenizer}.
* Maps from {@link com.azure.search.documents.indexes.implementation.models.KeywordTokenizer} to
* {@link KeywordTokenizer}.
*/
public static com.azure.search.documents.indexes.implementation.models.KeywordTokenizer map(KeywordTokenizer obj) {
public static KeywordTokenizer map(com.azure.search.documents.indexes.implementation.models.KeywordTokenizer obj) {
if (obj == null) {
return null;
}
com.azure.search.documents.indexes.implementation.models.KeywordTokenizer keywordTokenizer =
new com.azure.search.documents.indexes.implementation.models.KeywordTokenizer();
KeywordTokenizer keywordTokenizer = new KeywordTokenizer();

String name = obj.getName();
keywordTokenizer.setName(name);

Integer bufferSize = obj.getBufferSize();
keywordTokenizer.setBufferSize(bufferSize);
keywordTokenizer.setMaxTokenLength(bufferSize);
return keywordTokenizer;
}

/**
* Maps from {@link KeywordTokenizer} to
* {@link com.azure.search.documents.indexes.implementation.models.KeywordTokenizerV2}.
*/
public static com.azure.search.documents.indexes.implementation.models.KeywordTokenizerV2 map(KeywordTokenizer obj) {
if (obj == null) {
return null;
}
com.azure.search.documents.indexes.implementation.models.KeywordTokenizerV2 keywordTokenizerV2 =
new com.azure.search.documents.indexes.implementation.models.KeywordTokenizerV2();

String name = obj.getName();
keywordTokenizerV2.setName(name);

Integer maxTokenLength = obj.getMaxTokenLength();
keywordTokenizerV2.setMaxTokenLength(maxTokenLength);
return keywordTokenizerV2;
}

private KeywordTokenizerConverter() {
}
}
52 changes: 0 additions & 52 deletions ...ava/com/azure/search/documents/implementation/converters/KeywordTokenizerV2Converter.java
View file
Open in desktop

This file was deleted.

21 changes: 8 additions & 13 deletions .../java/com/azure/search/documents/implementation/converters/LexicalTokenizerConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,11 @@
import com.azure.search.documents.indexes.models.ClassicTokenizer;
import com.azure.search.documents.indexes.models.EdgeNGramTokenizer;
import com.azure.search.documents.indexes.models.KeywordTokenizer;
import com.azure.search.documents.indexes.models.KeywordTokenizerV2;
import com.azure.search.documents.indexes.models.LuceneStandardTokenizer;
import com.azure.search.documents.indexes.models.LuceneStandardTokenizerV2;
import com.azure.search.documents.indexes.models.MicrosoftLanguageStemmingTokenizer;
import com.azure.search.documents.indexes.models.MicrosoftLanguageTokenizer;
import com.azure.search.documents.indexes.models.NGramTokenizer;
import com.azure.search.documents.indexes.models.PathHierarchyTokenizerV2;
import com.azure.search.documents.indexes.models.PathHierarchyTokenizer;
import com.azure.search.documents.indexes.models.PatternTokenizer;
import com.azure.search.documents.indexes.models.UaxUrlEmailTokenizer;
import com.azure.search.documents.indexes.models.LexicalTokenizer;
Expand Down Expand Up @@ -43,7 +41,7 @@ public static LexicalTokenizer map(com.azure.search.documents.indexes.implementa
return LuceneStandardTokenizerConverter.map((com.azure.search.documents.indexes.implementation.models.LuceneStandardTokenizer) obj);
}
if (obj instanceof com.azure.search.documents.indexes.implementation.models.PathHierarchyTokenizerV2) {
return PathHierarchyTokenizerV2Converter.map((com.azure.search.documents.indexes.implementation.models.PathHierarchyTokenizerV2) obj);
return PathHierarchyTokenizerConverter.map((com.azure.search.documents.indexes.implementation.models.PathHierarchyTokenizerV2) obj);
}
if (obj instanceof com.azure.search.documents.indexes.implementation.models.ClassicTokenizer) {
return ClassicTokenizerConverter.map((com.azure.search.documents.indexes.implementation.models.ClassicTokenizer) obj);
Expand All @@ -52,13 +50,13 @@ public static LexicalTokenizer map(com.azure.search.documents.indexes.implementa
return KeywordTokenizerConverter.map((com.azure.search.documents.indexes.implementation.models.KeywordTokenizer) obj);
}
if (obj instanceof com.azure.search.documents.indexes.implementation.models.LuceneStandardTokenizerV2) {
return LuceneStandardTokenizerV2Converter.map((com.azure.search.documents.indexes.implementation.models.LuceneStandardTokenizerV2) obj);
return LuceneStandardTokenizerConverter.map((com.azure.search.documents.indexes.implementation.models.LuceneStandardTokenizerV2) obj);
}
if (obj instanceof com.azure.search.documents.indexes.implementation.models.UaxUrlEmailTokenizer) {
return UaxUrlEmailTokenizerConverter.map((com.azure.search.documents.indexes.implementation.models.UaxUrlEmailTokenizer) obj);
}
if (obj instanceof com.azure.search.documents.indexes.implementation.models.KeywordTokenizerV2) {
return KeywordTokenizerV2Converter.map((com.azure.search.documents.indexes.implementation.models.KeywordTokenizerV2) obj);
return KeywordTokenizerConverter.map((com.azure.search.documents.indexes.implementation.models.KeywordTokenizerV2) obj);
}
if (obj instanceof com.azure.search.documents.indexes.implementation.models.MicrosoftLanguageTokenizer) {
return MicrosoftLanguageTokenizerConverter.map((com.azure.search.documents.indexes.implementation.models.MicrosoftLanguageTokenizer) obj);
Expand Down Expand Up @@ -87,26 +85,23 @@ public static com.azure.search.documents.indexes.implementation.models.LexicalTo
if (obj instanceof MicrosoftLanguageStemmingTokenizer) {
return MicrosoftLanguageStemmingTokenizerConverter.map((MicrosoftLanguageStemmingTokenizer) obj);
}
if (obj instanceof KeywordTokenizerV2) {
return KeywordTokenizerV2Converter.map((KeywordTokenizerV2) obj);
if (obj instanceof KeywordTokenizer) {
return KeywordTokenizerConverter.map((KeywordTokenizer) obj);
}
if (obj instanceof KeywordTokenizer) {
return KeywordTokenizerConverter.map((KeywordTokenizer) obj);
}
if (obj instanceof MicrosoftLanguageTokenizer) {
return MicrosoftLanguageTokenizerConverter.map((MicrosoftLanguageTokenizer) obj);
}
if (obj instanceof LuceneStandardTokenizerV2) {
return LuceneStandardTokenizerV2Converter.map((LuceneStandardTokenizerV2) obj);
}
if (obj instanceof LuceneStandardTokenizer) {
return LuceneStandardTokenizerConverter.map((LuceneStandardTokenizer) obj);
}
if (obj instanceof UaxUrlEmailTokenizer) {
return UaxUrlEmailTokenizerConverter.map((UaxUrlEmailTokenizer) obj);
}
if (obj instanceof PathHierarchyTokenizerV2) {
return PathHierarchyTokenizerV2Converter.map((PathHierarchyTokenizerV2) obj);
if (obj instanceof PathHierarchyTokenizer) {
return PathHierarchyTokenizerConverter.map((PathHierarchyTokenizer) obj);
}
if (obj instanceof ClassicTokenizer) {
return ClassicTokenizerConverter.map((ClassicTokenizer) obj);
Expand Down
Loading