Skip to content

Commit 2ed93a8

Browse files
committed
chore: rename none->selfProvided
1 parent df406cb commit 2ed93a8

8 files changed

Lines changed: 31 additions & 31 deletions

File tree

src/it/java/io/weaviate/integration/AggregationITest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public static void beforeAll() throws IOException {
3535
.properties(
3636
Property.text("category"),
3737
Property.integer("price"))
38-
.vectors(Vectorizers.none()));
38+
.vectors(Vectorizers.selfProvided()));
3939

4040
var things = client.collections.use(COLLECTION);
4141
for (var category : List.of("Shoes", "Hat", "Jacket")) {

src/it/java/io/weaviate/integration/CollectionsITest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import io.weaviate.client6.v1.api.collections.config.Shard;
1919
import io.weaviate.client6.v1.api.collections.config.ShardStatus;
2020
import io.weaviate.client6.v1.api.collections.vectorindex.Hnsw;
21-
import io.weaviate.client6.v1.api.collections.vectorizers.NoneVectorizer;
21+
import io.weaviate.client6.v1.api.collections.vectorizers.SelfProvidedVectorizer;
2222
import io.weaviate.containers.Container;
2323

2424
public class CollectionsITest extends ConcurrentTest {
@@ -30,7 +30,7 @@ public void testCreateGetDelete() throws IOException {
3030
client.collections.create(collectionName,
3131
col -> col
3232
.properties(Property.text("username"), Property.integer("age"))
33-
.vectors(Vectorizers.none()));
33+
.vectors(Vectorizers.selfProvided()));
3434

3535
var thingsCollection = client.collections.getConfig(collectionName);
3636

@@ -40,7 +40,7 @@ public void testCreateGetDelete() throws IOException {
4040
.as("default vector").extractingByKey("default")
4141
.satisfies(defaultVector -> {
4242
Assertions.assertThat(defaultVector)
43-
.as("has none vectorizer").isInstanceOf(NoneVectorizer.class);
43+
.as("has none vectorizer").isInstanceOf(SelfProvidedVectorizer.class);
4444
Assertions.assertThat(defaultVector).extracting(Vectorizer::vectorIndex)
4545
.isInstanceOf(Hnsw.class);
4646
});

src/it/java/io/weaviate/integration/DataITest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ private static void createTestCollections() throws IOException {
117117
Property.integer("age"))
118118
.references(
119119
Property.reference("hasAwards", awardsGrammy, awardsOscar))
120-
.vectors(Vectorizers.none(VECTOR_INDEX)));
120+
.vectors(Vectorizers.selfProvided(VECTOR_INDEX)));
121121
}
122122

123123
@Test
@@ -233,7 +233,7 @@ public void testUpdate() throws IOException {
233233
collection -> collection
234234
.properties(Property.text("title"), Property.integer("year"))
235235
.references(Property.reference("writtenBy", nsAuthors))
236-
.vectors(Vectorizers.none()));
236+
.vectors(Vectorizers.selfProvided()));
237237

238238
var authors = client.collections.use(nsAuthors);
239239
var walter = authors.data.insert(Map.of("name", "walter scott"));

src/it/java/io/weaviate/integration/SearchITest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ private static Map<String, float[]> populateTest(int n) throws IOException {
132132
private static void createTestCollection() throws IOException {
133133
client.collections.create(COLLECTION, cfg -> cfg
134134
.properties(Property.text("category"))
135-
.vectors(Vectorizers.none(VECTOR_INDEX)));
135+
.vectors(Vectorizers.selfProvided(VECTOR_INDEX)));
136136
}
137137

138138
@Test

src/main/java/io/weaviate/client6/v1/api/collections/Vectorizer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
import io.weaviate.client6.v1.api.collections.vectorizers.Img2VecNeuralVectorizer;
1818
import io.weaviate.client6.v1.api.collections.vectorizers.Multi2VecClipVectorizer;
19-
import io.weaviate.client6.v1.api.collections.vectorizers.NoneVectorizer;
19+
import io.weaviate.client6.v1.api.collections.vectorizers.SelfProvidedVectorizer;
2020
import io.weaviate.client6.v1.api.collections.vectorizers.Text2VecContextionaryVectorizer;
2121
import io.weaviate.client6.v1.api.collections.vectorizers.Text2VecWeaviateVectorizer;
2222
import io.weaviate.client6.v1.internal.json.JsonEnum;
@@ -63,7 +63,7 @@ private final void addAdapter(Gson gson, Vectorizer.Kind kind, Class<? extends V
6363
}
6464

6565
private final void init(Gson gson) {
66-
addAdapter(gson, Vectorizer.Kind.NONE, NoneVectorizer.class);
66+
addAdapter(gson, Vectorizer.Kind.NONE, SelfProvidedVectorizer.class);
6767
addAdapter(gson, Vectorizer.Kind.IMG2VEC_NEURAL, Img2VecNeuralVectorizer.class);
6868
addAdapter(gson, Vectorizer.Kind.MULTI2VEC_CLIP, Multi2VecClipVectorizer.class);
6969
addAdapter(gson, Vectorizer.Kind.TEXT2VEC_WEAVIATE, Text2VecWeaviateVectorizer.class);

src/main/java/io/weaviate/client6/v1/api/collections/Vectorizers.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,30 @@
55

66
import io.weaviate.client6.v1.api.collections.vectorizers.Img2VecNeuralVectorizer;
77
import io.weaviate.client6.v1.api.collections.vectorizers.Multi2VecClipVectorizer;
8-
import io.weaviate.client6.v1.api.collections.vectorizers.NoneVectorizer;
8+
import io.weaviate.client6.v1.api.collections.vectorizers.SelfProvidedVectorizer;
99
import io.weaviate.client6.v1.api.collections.vectorizers.Text2VecContextionaryVectorizer;
1010
import io.weaviate.client6.v1.api.collections.vectorizers.Text2VecWeaviateVectorizer;
1111
import io.weaviate.client6.v1.internal.ObjectBuilder;
1212

1313
/** Static methods for creating instances of {@link Vectorizer}. */
1414
public final class Vectorizers {
1515

16-
public static Map.Entry<String, Vectorizer> none() {
17-
return none(VectorIndex.DEFAULT_VECTOR_NAME);
16+
public static Map.Entry<String, Vectorizer> selfProvided() {
17+
return selfProvided(VectorIndex.DEFAULT_VECTOR_NAME);
1818
}
1919

20-
public static Map.Entry<String, Vectorizer> none(
21-
Function<NoneVectorizer.Builder, ObjectBuilder<NoneVectorizer>> fn) {
22-
return none(VectorIndex.DEFAULT_VECTOR_NAME, fn);
20+
public static Map.Entry<String, Vectorizer> selfProvided(
21+
Function<SelfProvidedVectorizer.Builder, ObjectBuilder<SelfProvidedVectorizer>> fn) {
22+
return selfProvided(VectorIndex.DEFAULT_VECTOR_NAME, fn);
2323
}
2424

25-
public static Map.Entry<String, Vectorizer> none(String vectorName) {
26-
return Map.entry(vectorName, NoneVectorizer.of());
25+
public static Map.Entry<String, Vectorizer> selfProvided(String vectorName) {
26+
return Map.entry(vectorName, SelfProvidedVectorizer.of());
2727
}
2828

29-
public static Map.Entry<String, Vectorizer> none(String vectorName,
30-
Function<NoneVectorizer.Builder, ObjectBuilder<NoneVectorizer>> fn) {
31-
return Map.entry(vectorName, NoneVectorizer.of(fn));
29+
public static Map.Entry<String, Vectorizer> selfProvided(String vectorName,
30+
Function<SelfProvidedVectorizer.Builder, ObjectBuilder<SelfProvidedVectorizer>> fn) {
31+
return Map.entry(vectorName, SelfProvidedVectorizer.of(fn));
3232
}
3333

3434
public static Map.Entry<String, Vectorizer> img2vecNeural() {

src/main/java/io/weaviate/client6/v1/api/collections/vectorizers/NoneVectorizer.java renamed to src/main/java/io/weaviate/client6/v1/api/collections/vectorizers/SelfProvidedVectorizer.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import io.weaviate.client6.v1.api.collections.vectorindex.Hnsw;
88
import io.weaviate.client6.v1.internal.ObjectBuilder;
99

10-
public record NoneVectorizer(VectorIndex vectorIndex) implements Vectorizer {
10+
public record SelfProvidedVectorizer(VectorIndex vectorIndex) implements Vectorizer {
1111
@Override
1212
public Kind _kind() {
1313
return Vectorizer.Kind.NONE;
@@ -18,19 +18,19 @@ public Object _self() {
1818
return this;
1919
}
2020

21-
public static NoneVectorizer of() {
21+
public static SelfProvidedVectorizer of() {
2222
return of(ObjectBuilder.identity());
2323
}
2424

25-
public static NoneVectorizer of(Function<Builder, ObjectBuilder<NoneVectorizer>> fn) {
25+
public static SelfProvidedVectorizer of(Function<Builder, ObjectBuilder<SelfProvidedVectorizer>> fn) {
2626
return fn.apply(new Builder()).build();
2727
}
2828

29-
public NoneVectorizer(Builder builder) {
29+
public SelfProvidedVectorizer(Builder builder) {
3030
this(builder.vectorIndex);
3131
}
3232

33-
public static class Builder implements ObjectBuilder<NoneVectorizer> {
33+
public static class Builder implements ObjectBuilder<SelfProvidedVectorizer> {
3434
private VectorIndex vectorIndex = Hnsw.of();
3535

3636
public Builder vectorIndex(VectorIndex vectorIndex) {
@@ -39,8 +39,8 @@ public Builder vectorIndex(VectorIndex vectorIndex) {
3939
}
4040

4141
@Override
42-
public NoneVectorizer build() {
43-
return new NoneVectorizer(this);
42+
public SelfProvidedVectorizer build() {
43+
return new SelfProvidedVectorizer(this);
4444
}
4545
}
4646
}

src/test/java/io/weaviate/client6/v1/internal/json/JSONTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import io.weaviate.client6.v1.api.collections.vectorindex.Hnsw;
3333
import io.weaviate.client6.v1.api.collections.vectorizers.Img2VecNeuralVectorizer;
3434
import io.weaviate.client6.v1.api.collections.vectorizers.Multi2VecClipVectorizer;
35-
import io.weaviate.client6.v1.api.collections.vectorizers.NoneVectorizer;
35+
import io.weaviate.client6.v1.api.collections.vectorizers.SelfProvidedVectorizer;
3636
import io.weaviate.client6.v1.api.collections.vectorizers.Text2VecContextionaryVectorizer;
3737
import io.weaviate.client6.v1.api.collections.vectorizers.Text2VecWeaviateVectorizer;
3838

@@ -44,7 +44,7 @@ public static Object[][] testCases() {
4444
// Vectorizer.CustomTypeAdapterFactory
4545
{
4646
Vectorizer.class,
47-
NoneVectorizer.of(),
47+
SelfProvidedVectorizer.of(),
4848
"""
4949
{
5050
"vectorIndexType": "hnsw",
@@ -131,7 +131,7 @@ public static Object[][] testCases() {
131131
// VectorIndex.CustomTypeAdapterFactory
132132
{
133133
Vectorizer.class,
134-
NoneVectorizer.of(none -> none
134+
SelfProvidedVectorizer.of(none -> none
135135
.vectorIndex(Flat.of(flat -> flat
136136
.vectorCacheMaxObjects(100)))),
137137
"""
@@ -144,7 +144,7 @@ public static Object[][] testCases() {
144144
},
145145
{
146146
Vectorizer.class,
147-
NoneVectorizer.of(none -> none
147+
SelfProvidedVectorizer.of(none -> none
148148
.vectorIndex(Hnsw.of(hnsw -> hnsw
149149
.distance(Distance.DOT)
150150
.ef(1)

0 commit comments

Comments
 (0)