Skip to content

Commit 16e3a74

Browse files
refactor(specs): split injection schema (generated)
algolia/api-clients-automation#6224 Co-authored-by: algolia-bot <accounts+algolia-api-client-bot@algolia.com> Co-authored-by: Clara Muller <5667350+ClaraMuller@users.noreply.github.com>
1 parent b78f967 commit 16e3a74

13 files changed

+272
-87
lines changed

algoliasearch/src/main/java/com/algolia/model/composition/External.java renamed to algoliasearch/src/main/java/com/algolia/model/composition/InjectedItemExternal.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
import com.fasterxml.jackson.databind.annotation.*;
88
import java.util.Objects;
99

10-
/** External */
11-
public class External {
10+
/** InjectedItemExternal */
11+
public class InjectedItemExternal {
1212

1313
@JsonProperty("index")
1414
private String index;
@@ -19,7 +19,7 @@ public class External {
1919
@JsonProperty("ordering")
2020
private ExternalOrdering ordering;
2121

22-
public External setIndex(String index) {
22+
public InjectedItemExternal setIndex(String index) {
2323
this.index = index;
2424
return this;
2525
}
@@ -30,7 +30,7 @@ public String getIndex() {
3030
return index;
3131
}
3232

33-
public External setParams(BaseInjectionQueryParameters params) {
33+
public InjectedItemExternal setParams(BaseInjectionQueryParameters params) {
3434
this.params = params;
3535
return this;
3636
}
@@ -41,7 +41,7 @@ public BaseInjectionQueryParameters getParams() {
4141
return params;
4242
}
4343

44-
public External setOrdering(ExternalOrdering ordering) {
44+
public InjectedItemExternal setOrdering(ExternalOrdering ordering) {
4545
this.ordering = ordering;
4646
return this;
4747
}
@@ -60,11 +60,11 @@ public boolean equals(Object o) {
6060
if (o == null || getClass() != o.getClass()) {
6161
return false;
6262
}
63-
External external = (External) o;
63+
InjectedItemExternal injectedItemExternal = (InjectedItemExternal) o;
6464
return (
65-
Objects.equals(this.index, external.index) &&
66-
Objects.equals(this.params, external.params) &&
67-
Objects.equals(this.ordering, external.ordering)
65+
Objects.equals(this.index, injectedItemExternal.index) &&
66+
Objects.equals(this.params, injectedItemExternal.params) &&
67+
Objects.equals(this.ordering, injectedItemExternal.ordering)
6868
);
6969
}
7070

@@ -76,7 +76,7 @@ public int hashCode() {
7676
@Override
7777
public String toString() {
7878
StringBuilder sb = new StringBuilder();
79-
sb.append("class External {\n");
79+
sb.append("class InjectedItemExternal {\n");
8080
sb.append(" index: ").append(toIndentedString(index)).append("\n");
8181
sb.append(" params: ").append(toIndentedString(params)).append("\n");
8282
sb.append(" ordering: ").append(toIndentedString(ordering)).append("\n");

algoliasearch/src/main/java/com/algolia/model/composition/ExternalSource.java renamed to algoliasearch/src/main/java/com/algolia/model/composition/InjectedItemExternalSource.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,20 @@
1111
* Injected items will originate from externally provided objectIDs (that must exist in the index)
1212
* given at runtime in the run request payload.
1313
*/
14-
@JsonDeserialize(as = ExternalSource.class)
15-
public class ExternalSource implements InjectedItemSource {
14+
@JsonDeserialize(as = InjectedItemExternalSource.class)
15+
public class InjectedItemExternalSource implements InjectedItemSource {
1616

1717
@JsonProperty("external")
18-
private External external;
18+
private InjectedItemExternal external;
1919

20-
public ExternalSource setExternal(External external) {
20+
public InjectedItemExternalSource setExternal(InjectedItemExternal external) {
2121
this.external = external;
2222
return this;
2323
}
2424

2525
/** Get external */
2626
@javax.annotation.Nonnull
27-
public External getExternal() {
27+
public InjectedItemExternal getExternal() {
2828
return external;
2929
}
3030

@@ -36,8 +36,8 @@ public boolean equals(Object o) {
3636
if (o == null || getClass() != o.getClass()) {
3737
return false;
3838
}
39-
ExternalSource externalSource = (ExternalSource) o;
40-
return Objects.equals(this.external, externalSource.external);
39+
InjectedItemExternalSource injectedItemExternalSource = (InjectedItemExternalSource) o;
40+
return Objects.equals(this.external, injectedItemExternalSource.external);
4141
}
4242

4343
@Override
@@ -48,7 +48,7 @@ public int hashCode() {
4848
@Override
4949
public String toString() {
5050
StringBuilder sb = new StringBuilder();
51-
sb.append("class ExternalSource {\n");
51+
sb.append("class InjectedItemExternalSource {\n");
5252
sb.append(" external: ").append(toIndentedString(external)).append("\n");
5353
sb.append("}");
5454
return sb.toString();

algoliasearch/src/main/java/com/algolia/model/composition/Search.java renamed to algoliasearch/src/main/java/com/algolia/model/composition/InjectedItemSearch.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@
77
import com.fasterxml.jackson.databind.annotation.*;
88
import java.util.Objects;
99

10-
/** Search */
11-
public class Search {
10+
/** InjectedItemSearch */
11+
public class InjectedItemSearch {
1212

1313
@JsonProperty("index")
1414
private String index;
1515

1616
@JsonProperty("params")
1717
private BaseInjectionQueryParameters params;
1818

19-
public Search setIndex(String index) {
19+
public InjectedItemSearch setIndex(String index) {
2020
this.index = index;
2121
return this;
2222
}
@@ -27,7 +27,7 @@ public String getIndex() {
2727
return index;
2828
}
2929

30-
public Search setParams(BaseInjectionQueryParameters params) {
30+
public InjectedItemSearch setParams(BaseInjectionQueryParameters params) {
3131
this.params = params;
3232
return this;
3333
}
@@ -46,8 +46,8 @@ public boolean equals(Object o) {
4646
if (o == null || getClass() != o.getClass()) {
4747
return false;
4848
}
49-
Search search = (Search) o;
50-
return Objects.equals(this.index, search.index) && Objects.equals(this.params, search.params);
49+
InjectedItemSearch injectedItemSearch = (InjectedItemSearch) o;
50+
return Objects.equals(this.index, injectedItemSearch.index) && Objects.equals(this.params, injectedItemSearch.params);
5151
}
5252

5353
@Override
@@ -58,7 +58,7 @@ public int hashCode() {
5858
@Override
5959
public String toString() {
6060
StringBuilder sb = new StringBuilder();
61-
sb.append("class Search {\n");
61+
sb.append("class InjectedItemSearch {\n");
6262
sb.append(" index: ").append(toIndentedString(index)).append("\n");
6363
sb.append(" params: ").append(toIndentedString(params)).append("\n");
6464
sb.append("}");

algoliasearch/src/main/java/com/algolia/model/composition/SearchSource.java renamed to algoliasearch/src/main/java/com/algolia/model/composition/InjectedItemSearchSource.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@
88
import java.util.Objects;
99

1010
/** Injected items will originate from a search request performed on the specified index. */
11-
@JsonDeserialize(as = SearchSource.class)
12-
public class SearchSource implements InjectedItemSource {
11+
@JsonDeserialize(as = InjectedItemSearchSource.class)
12+
public class InjectedItemSearchSource implements InjectedItemSource {
1313

1414
@JsonProperty("search")
15-
private Search search;
15+
private InjectedItemSearch search;
1616

17-
public SearchSource setSearch(Search search) {
17+
public InjectedItemSearchSource setSearch(InjectedItemSearch search) {
1818
this.search = search;
1919
return this;
2020
}
2121

2222
/** Get search */
2323
@javax.annotation.Nonnull
24-
public Search getSearch() {
24+
public InjectedItemSearch getSearch() {
2525
return search;
2626
}
2727

@@ -33,8 +33,8 @@ public boolean equals(Object o) {
3333
if (o == null || getClass() != o.getClass()) {
3434
return false;
3535
}
36-
SearchSource searchSource = (SearchSource) o;
37-
return Objects.equals(this.search, searchSource.search);
36+
InjectedItemSearchSource injectedItemSearchSource = (InjectedItemSearchSource) o;
37+
return Objects.equals(this.search, injectedItemSearchSource.search);
3838
}
3939

4040
@Override
@@ -45,7 +45,7 @@ public int hashCode() {
4545
@Override
4646
public String toString() {
4747
StringBuilder sb = new StringBuilder();
48-
sb.append("class SearchSource {\n");
48+
sb.append("class InjectedItemSearchSource {\n");
4949
sb.append(" search: ").append(toIndentedString(search)).append("\n");
5050
sb.append("}");
5151
return sb.toString();

algoliasearch/src/main/java/com/algolia/model/composition/InjectedItemSource.java

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,26 @@ class Deserializer extends JsonDeserializer<InjectedItemSource> {
2121
@Override
2222
public InjectedItemSource deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException {
2323
JsonNode tree = jp.readValueAsTree();
24-
// deserialize SearchSource
24+
// deserialize InjectedItemSearchSource
2525
if (tree.isObject() && tree.has("search")) {
2626
try (JsonParser parser = tree.traverse(jp.getCodec())) {
27-
return parser.readValueAs(SearchSource.class);
27+
return parser.readValueAs(InjectedItemSearchSource.class);
2828
} catch (Exception e) {
2929
// deserialization failed, continue
30-
LOGGER.finest("Failed to deserialize oneOf SearchSource (error: " + e.getMessage() + ") (type: SearchSource)");
30+
LOGGER.finest(
31+
"Failed to deserialize oneOf InjectedItemSearchSource (error: " + e.getMessage() + ") (type: InjectedItemSearchSource)"
32+
);
3133
}
3234
}
33-
// deserialize ExternalSource
35+
// deserialize InjectedItemExternalSource
3436
if (tree.isObject() && tree.has("external")) {
3537
try (JsonParser parser = tree.traverse(jp.getCodec())) {
36-
return parser.readValueAs(ExternalSource.class);
38+
return parser.readValueAs(InjectedItemExternalSource.class);
3739
} catch (Exception e) {
3840
// deserialization failed, continue
39-
LOGGER.finest("Failed to deserialize oneOf ExternalSource (error: " + e.getMessage() + ") (type: ExternalSource)");
41+
LOGGER.finest(
42+
"Failed to deserialize oneOf InjectedItemExternalSource (error: " + e.getMessage() + ") (type: InjectedItemExternalSource)"
43+
);
4044
}
4145
}
4246
throw new AlgoliaRuntimeException(String.format("Failed to deserialize json element: %s", tree));

algoliasearch/src/main/java/com/algolia/model/composition/Injection.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,31 +13,31 @@
1313
public class Injection {
1414

1515
@JsonProperty("main")
16-
private Main main;
16+
private InjectionMain main;
1717

1818
@JsonProperty("injectedItems")
19-
private List<InjectedItem> injectedItems;
19+
private List<InjectionInjectedItem> injectedItems;
2020

2121
@JsonProperty("deduplication")
2222
private Deduplication deduplication;
2323

24-
public Injection setMain(Main main) {
24+
public Injection setMain(InjectionMain main) {
2525
this.main = main;
2626
return this;
2727
}
2828

2929
/** Get main */
3030
@javax.annotation.Nonnull
31-
public Main getMain() {
31+
public InjectionMain getMain() {
3232
return main;
3333
}
3434

35-
public Injection setInjectedItems(List<InjectedItem> injectedItems) {
35+
public Injection setInjectedItems(List<InjectionInjectedItem> injectedItems) {
3636
this.injectedItems = injectedItems;
3737
return this;
3838
}
3939

40-
public Injection addInjectedItems(InjectedItem injectedItemsItem) {
40+
public Injection addInjectedItems(InjectionInjectedItem injectedItemsItem) {
4141
if (this.injectedItems == null) {
4242
this.injectedItems = new ArrayList<>();
4343
}
@@ -47,7 +47,7 @@ public Injection addInjectedItems(InjectedItem injectedItemsItem) {
4747

4848
/** list of injected items of the current Composition. */
4949
@javax.annotation.Nullable
50-
public List<InjectedItem> getInjectedItems() {
50+
public List<InjectionInjectedItem> getInjectedItems() {
5151
return injectedItems;
5252
}
5353

algoliasearch/src/main/java/com/algolia/model/composition/InjectedItem.java renamed to algoliasearch/src/main/java/com/algolia/model/composition/InjectionInjectedItem.java

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
import com.fasterxml.jackson.databind.annotation.*;
88
import java.util.Objects;
99

10-
/** InjectedItem */
11-
public class InjectedItem {
10+
/** InjectionInjectedItem */
11+
public class InjectionInjectedItem {
1212

1313
@JsonProperty("key")
1414
private String key;
@@ -25,7 +25,7 @@ public class InjectedItem {
2525
@JsonProperty("metadata")
2626
private InjectedItemMetadata metadata;
2727

28-
public InjectedItem setKey(String key) {
28+
public InjectionInjectedItem setKey(String key) {
2929
this.key = key;
3030
return this;
3131
}
@@ -36,7 +36,7 @@ public String getKey() {
3636
return key;
3737
}
3838

39-
public InjectedItem setSource(InjectedItemSource source) {
39+
public InjectionInjectedItem setSource(InjectedItemSource source) {
4040
this.source = source;
4141
return this;
4242
}
@@ -47,29 +47,29 @@ public InjectedItemSource getSource() {
4747
return source;
4848
}
4949

50-
public InjectedItem setPosition(Integer position) {
50+
public InjectionInjectedItem setPosition(Integer position) {
5151
this.position = position;
5252
return this;
5353
}
5454

55-
/** Get position minimum: 0 maximum: 19 */
55+
/** Get position minimum: 0 maximum: 99 */
5656
@javax.annotation.Nonnull
5757
public Integer getPosition() {
5858
return position;
5959
}
6060

61-
public InjectedItem setLength(Integer length) {
61+
public InjectionInjectedItem setLength(Integer length) {
6262
this.length = length;
6363
return this;
6464
}
6565

66-
/** Get length minimum: 0 maximum: 20 */
66+
/** Get length minimum: 0 maximum: 50 */
6767
@javax.annotation.Nonnull
6868
public Integer getLength() {
6969
return length;
7070
}
7171

72-
public InjectedItem setMetadata(InjectedItemMetadata metadata) {
72+
public InjectionInjectedItem setMetadata(InjectedItemMetadata metadata) {
7373
this.metadata = metadata;
7474
return this;
7575
}
@@ -88,13 +88,13 @@ public boolean equals(Object o) {
8888
if (o == null || getClass() != o.getClass()) {
8989
return false;
9090
}
91-
InjectedItem injectedItem = (InjectedItem) o;
91+
InjectionInjectedItem injectionInjectedItem = (InjectionInjectedItem) o;
9292
return (
93-
Objects.equals(this.key, injectedItem.key) &&
94-
Objects.equals(this.source, injectedItem.source) &&
95-
Objects.equals(this.position, injectedItem.position) &&
96-
Objects.equals(this.length, injectedItem.length) &&
97-
Objects.equals(this.metadata, injectedItem.metadata)
93+
Objects.equals(this.key, injectionInjectedItem.key) &&
94+
Objects.equals(this.source, injectionInjectedItem.source) &&
95+
Objects.equals(this.position, injectionInjectedItem.position) &&
96+
Objects.equals(this.length, injectionInjectedItem.length) &&
97+
Objects.equals(this.metadata, injectionInjectedItem.metadata)
9898
);
9999
}
100100

@@ -106,7 +106,7 @@ public int hashCode() {
106106
@Override
107107
public String toString() {
108108
StringBuilder sb = new StringBuilder();
109-
sb.append("class InjectedItem {\n");
109+
sb.append("class InjectionInjectedItem {\n");
110110
sb.append(" key: ").append(toIndentedString(key)).append("\n");
111111
sb.append(" source: ").append(toIndentedString(source)).append("\n");
112112
sb.append(" position: ").append(toIndentedString(position)).append("\n");

0 commit comments

Comments
 (0)