Skip to content

Commit df5c0a7

Browse files
bsboddenbsbodden
committed
refactor: delombok all non-test sources (resolves gh-263)
1 parent 1185022 commit df5c0a7

27 files changed

+457
-111
lines changed

‎redis-om-spring/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -176,12 +176,6 @@
176176
<artifactId>ulid-creator</artifactId>
177177
<version>${ulid.version}</version>
178178
</dependency>
179-
<dependency>
180-
<groupId>org.projectlombok</groupId>
181-
<artifactId>lombok</artifactId>
182-
<version>${lombok.version}</version>
183-
<optional>true</optional>
184-
</dependency>
185179
<dependency>
186180
<groupId>org.apache.commons</groupId>
187181
<artifactId>commons-lang3</artifactId>
@@ -270,6 +264,12 @@
270264
<version>${elementary.version}</version>
271265
<scope>test</scope>
272266
</dependency>
267+
<dependency>
268+
<groupId>org.projectlombok</groupId>
269+
<artifactId>lombok</artifactId>
270+
<version>${lombok.version}</version>
271+
<scope>test</scope>
272+
</dependency>
273273
</dependencies>
274274

275275
<build>

‎redis-om-spring/src/main/java/com/redis/om/spring/CustomRedisKeyValueTemplate.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.redis.om.spring;
22

33
import com.redis.om.spring.id.ULIDIdentifierGenerator;
4-
import lombok.NonNull;
54
import org.springframework.data.keyvalue.core.KeyValueTemplate;
65
import org.springframework.data.redis.core.RedisKeyValueAdapter;
76
import org.springframework.data.redis.core.RedisKeyValueTemplate;
@@ -47,7 +46,7 @@ public RedisKeyValueAdapter getAdapter() {
4746
* org.springframework.data.keyvalue.core.KeyValueTemplate#getMappingContext(
4847
* ) */
4948
@Override
50-
public @NonNull RedisMappingContext getMappingContext() {
49+
public RedisMappingContext getMappingContext() {
5150
return (RedisMappingContext) super.getMappingContext();
5251
}
5352

‎redis-om-spring/src/main/java/com/redis/om/spring/RediSearchIndexer.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,7 @@
3434
import java.util.*;
3535
import java.util.concurrent.ConcurrentHashMap;
3636

37-
import static com.redis.om.spring.util.ObjectUtils.getBeanDefinitionsFor;
38-
import static com.redis.om.spring.util.ObjectUtils.getIdFieldForEntityClass;
39-
import static com.redis.om.spring.util.ObjectUtils.getCollectionElementClass;
40-
import static com.redis.om.spring.util.ObjectUtils.getDeclaredFieldsTransitively;
37+
import static com.redis.om.spring.util.ObjectUtils.*;
4138

4239
@Component
4340
public class RediSearchIndexer {

‎redis-om-spring/src/main/java/com/redis/om/spring/RedisOMSpringProperties.java‎

Lines changed: 259 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
package com.redis.om.spring;
22

33
import jakarta.validation.constraints.NotNull;
4-
import lombok.Data;
54
import org.springframework.boot.context.properties.ConfigurationProperties;
65

76
@ConfigurationProperties(
8-
prefix = "redis.om.spring",
9-
ignoreInvalidFields = true
7+
prefix = "redis.om.spring", ignoreInvalidFields = true
108
)
119
public class RedisOMSpringProperties {
1210
// repository properties
@@ -37,7 +35,6 @@ public void setLimit(int limit) {
3735
}
3836

3937
// DJL properties
40-
@Data
4138
public static class Djl {
4239
private static final String DEFAULT_ENGINE = "PyTorch";
4340
@NotNull
@@ -77,6 +74,264 @@ public static class Djl {
7774
private String faceEmbeddingModelName = "face_feature";
7875
@NotNull
7976
private String faceEmbeddingModelModelUrls = "https://resources.djl.ai/test-models/pytorch/face_feature.zip";
77+
78+
public Djl() {
79+
}
80+
81+
public @NotNull boolean isEnabled() {
82+
return this.enabled;
83+
}
84+
85+
public @NotNull String getImageEmbeddingModelEngine() {
86+
return this.imageEmbeddingModelEngine;
87+
}
88+
89+
public @NotNull String getImageEmbeddingModelModelUrls() {
90+
return this.imageEmbeddingModelModelUrls;
91+
}
92+
93+
public @NotNull int getDefaultImagePipelineResizeWidth() {
94+
return this.defaultImagePipelineResizeWidth;
95+
}
96+
97+
public @NotNull int getDefaultImagePipelineResizeHeight() {
98+
return this.defaultImagePipelineResizeHeight;
99+
}
100+
101+
public @NotNull boolean isDefaultImagePipelineCenterCrop() {
102+
return this.defaultImagePipelineCenterCrop;
103+
}
104+
105+
public @NotNull String getSentenceTokenizerMaxLength() {
106+
return this.sentenceTokenizerMaxLength;
107+
}
108+
109+
public @NotNull String getSentenceTokenizerModelMaxLength() {
110+
return this.sentenceTokenizerModelMaxLength;
111+
}
112+
113+
public @NotNull String getSentenceTokenizerModel() {
114+
return this.sentenceTokenizerModel;
115+
}
116+
117+
public @NotNull String getFaceDetectionModelEngine() {
118+
return this.faceDetectionModelEngine;
119+
}
120+
121+
public @NotNull String getFaceDetectionModelName() {
122+
return this.faceDetectionModelName;
123+
}
124+
125+
public @NotNull String getFaceDetectionModelModelUrls() {
126+
return this.faceDetectionModelModelUrls;
127+
}
128+
129+
public @NotNull String getFaceEmbeddingModelEngine() {
130+
return this.faceEmbeddingModelEngine;
131+
}
132+
133+
public @NotNull String getFaceEmbeddingModelName() {
134+
return this.faceEmbeddingModelName;
135+
}
136+
137+
public @NotNull String getFaceEmbeddingModelModelUrls() {
138+
return this.faceEmbeddingModelModelUrls;
139+
}
140+
141+
public void setEnabled(@NotNull boolean enabled) {
142+
this.enabled = enabled;
143+
}
144+
145+
public void setImageEmbeddingModelEngine(@NotNull String imageEmbeddingModelEngine) {
146+
this.imageEmbeddingModelEngine = imageEmbeddingModelEngine;
147+
}
148+
149+
public void setImageEmbeddingModelModelUrls(@NotNull String imageEmbeddingModelModelUrls) {
150+
this.imageEmbeddingModelModelUrls = imageEmbeddingModelModelUrls;
151+
}
152+
153+
public void setDefaultImagePipelineResizeWidth(@NotNull int defaultImagePipelineResizeWidth) {
154+
this.defaultImagePipelineResizeWidth = defaultImagePipelineResizeWidth;
155+
}
156+
157+
public void setDefaultImagePipelineResizeHeight(@NotNull int defaultImagePipelineResizeHeight) {
158+
this.defaultImagePipelineResizeHeight = defaultImagePipelineResizeHeight;
159+
}
160+
161+
public void setDefaultImagePipelineCenterCrop(@NotNull boolean defaultImagePipelineCenterCrop) {
162+
this.defaultImagePipelineCenterCrop = defaultImagePipelineCenterCrop;
163+
}
164+
165+
public void setSentenceTokenizerMaxLength(@NotNull String sentenceTokenizerMaxLength) {
166+
this.sentenceTokenizerMaxLength = sentenceTokenizerMaxLength;
167+
}
168+
169+
public void setSentenceTokenizerModelMaxLength(@NotNull String sentenceTokenizerModelMaxLength) {
170+
this.sentenceTokenizerModelMaxLength = sentenceTokenizerModelMaxLength;
171+
}
172+
173+
public void setSentenceTokenizerModel(@NotNull String sentenceTokenizerModel) {
174+
this.sentenceTokenizerModel = sentenceTokenizerModel;
175+
}
176+
177+
public void setFaceDetectionModelEngine(@NotNull String faceDetectionModelEngine) {
178+
this.faceDetectionModelEngine = faceDetectionModelEngine;
179+
}
180+
181+
public void setFaceDetectionModelName(@NotNull String faceDetectionModelName) {
182+
this.faceDetectionModelName = faceDetectionModelName;
183+
}
184+
185+
public void setFaceDetectionModelModelUrls(@NotNull String faceDetectionModelModelUrls) {
186+
this.faceDetectionModelModelUrls = faceDetectionModelModelUrls;
187+
}
188+
189+
public void setFaceEmbeddingModelEngine(@NotNull String faceEmbeddingModelEngine) {
190+
this.faceEmbeddingModelEngine = faceEmbeddingModelEngine;
191+
}
192+
193+
public void setFaceEmbeddingModelName(@NotNull String faceEmbeddingModelName) {
194+
this.faceEmbeddingModelName = faceEmbeddingModelName;
195+
}
196+
197+
public void setFaceEmbeddingModelModelUrls(@NotNull String faceEmbeddingModelModelUrls) {
198+
this.faceEmbeddingModelModelUrls = faceEmbeddingModelModelUrls;
199+
}
200+
201+
public boolean equals(final Object o) {
202+
if (o == this)
203+
return true;
204+
if (!(o instanceof Djl))
205+
return false;
206+
final Djl other = (Djl) o;
207+
if (!other.canEqual((Object) this))
208+
return false;
209+
if (this.isEnabled() != other.isEnabled())
210+
return false;
211+
final Object this$imageEmbeddingModelEngine = this.getImageEmbeddingModelEngine();
212+
final Object other$imageEmbeddingModelEngine = other.getImageEmbeddingModelEngine();
213+
if (this$imageEmbeddingModelEngine == null ?
214+
other$imageEmbeddingModelEngine != null :
215+
!this$imageEmbeddingModelEngine.equals(other$imageEmbeddingModelEngine))
216+
return false;
217+
final Object this$imageEmbeddingModelModelUrls = this.getImageEmbeddingModelModelUrls();
218+
final Object other$imageEmbeddingModelModelUrls = other.getImageEmbeddingModelModelUrls();
219+
if (this$imageEmbeddingModelModelUrls == null ?
220+
other$imageEmbeddingModelModelUrls != null :
221+
!this$imageEmbeddingModelModelUrls.equals(other$imageEmbeddingModelModelUrls))
222+
return false;
223+
if (this.getDefaultImagePipelineResizeWidth() != other.getDefaultImagePipelineResizeWidth())
224+
return false;
225+
if (this.getDefaultImagePipelineResizeHeight() != other.getDefaultImagePipelineResizeHeight())
226+
return false;
227+
if (this.isDefaultImagePipelineCenterCrop() != other.isDefaultImagePipelineCenterCrop())
228+
return false;
229+
final Object this$sentenceTokenizerMaxLength = this.getSentenceTokenizerMaxLength();
230+
final Object other$sentenceTokenizerMaxLength = other.getSentenceTokenizerMaxLength();
231+
if (this$sentenceTokenizerMaxLength == null ?
232+
other$sentenceTokenizerMaxLength != null :
233+
!this$sentenceTokenizerMaxLength.equals(other$sentenceTokenizerMaxLength))
234+
return false;
235+
final Object this$sentenceTokenizerModelMaxLength = this.getSentenceTokenizerModelMaxLength();
236+
final Object other$sentenceTokenizerModelMaxLength = other.getSentenceTokenizerModelMaxLength();
237+
if (this$sentenceTokenizerModelMaxLength == null ?
238+
other$sentenceTokenizerModelMaxLength != null :
239+
!this$sentenceTokenizerModelMaxLength.equals(other$sentenceTokenizerModelMaxLength))
240+
return false;
241+
final Object this$sentenceTokenizerModel = this.getSentenceTokenizerModel();
242+
final Object other$sentenceTokenizerModel = other.getSentenceTokenizerModel();
243+
if (this$sentenceTokenizerModel == null ?
244+
other$sentenceTokenizerModel != null :
245+
!this$sentenceTokenizerModel.equals(other$sentenceTokenizerModel))
246+
return false;
247+
final Object this$faceDetectionModelEngine = this.getFaceDetectionModelEngine();
248+
final Object other$faceDetectionModelEngine = other.getFaceDetectionModelEngine();
249+
if (this$faceDetectionModelEngine == null ?
250+
other$faceDetectionModelEngine != null :
251+
!this$faceDetectionModelEngine.equals(other$faceDetectionModelEngine))
252+
return false;
253+
final Object this$faceDetectionModelName = this.getFaceDetectionModelName();
254+
final Object other$faceDetectionModelName = other.getFaceDetectionModelName();
255+
if (this$faceDetectionModelName == null ?
256+
other$faceDetectionModelName != null :
257+
!this$faceDetectionModelName.equals(other$faceDetectionModelName))
258+
return false;
259+
final Object this$faceDetectionModelModelUrls = this.getFaceDetectionModelModelUrls();
260+
final Object other$faceDetectionModelModelUrls = other.getFaceDetectionModelModelUrls();
261+
if (this$faceDetectionModelModelUrls == null ?
262+
other$faceDetectionModelModelUrls != null :
263+
!this$faceDetectionModelModelUrls.equals(other$faceDetectionModelModelUrls))
264+
return false;
265+
final Object this$faceEmbeddingModelEngine = this.getFaceEmbeddingModelEngine();
266+
final Object other$faceEmbeddingModelEngine = other.getFaceEmbeddingModelEngine();
267+
if (this$faceEmbeddingModelEngine == null ?
268+
other$faceEmbeddingModelEngine != null :
269+
!this$faceEmbeddingModelEngine.equals(other$faceEmbeddingModelEngine))
270+
return false;
271+
final Object this$faceEmbeddingModelName = this.getFaceEmbeddingModelName();
272+
final Object other$faceEmbeddingModelName = other.getFaceEmbeddingModelName();
273+
if (this$faceEmbeddingModelName == null ?
274+
other$faceEmbeddingModelName != null :
275+
!this$faceEmbeddingModelName.equals(other$faceEmbeddingModelName))
276+
return false;
277+
final Object this$faceEmbeddingModelModelUrls = this.getFaceEmbeddingModelModelUrls();
278+
final Object other$faceEmbeddingModelModelUrls = other.getFaceEmbeddingModelModelUrls();
279+
if (this$faceEmbeddingModelModelUrls == null ?
280+
other$faceEmbeddingModelModelUrls != null :
281+
!this$faceEmbeddingModelModelUrls.equals(other$faceEmbeddingModelModelUrls))
282+
return false;
283+
return true;
284+
}
285+
286+
protected boolean canEqual(final Object other) {
287+
return other instanceof Djl;
288+
}
289+
290+
public int hashCode() {
291+
final int PRIME = 59;
292+
int result = 1;
293+
result = result * PRIME + (this.isEnabled() ? 79 : 97);
294+
final Object $imageEmbeddingModelEngine = this.getImageEmbeddingModelEngine();
295+
result = result * PRIME + ($imageEmbeddingModelEngine == null ? 43 : $imageEmbeddingModelEngine.hashCode());
296+
final Object $imageEmbeddingModelModelUrls = this.getImageEmbeddingModelModelUrls();
297+
result = result * PRIME + ($imageEmbeddingModelModelUrls == null ?
298+
43 :
299+
$imageEmbeddingModelModelUrls.hashCode());
300+
result = result * PRIME + this.getDefaultImagePipelineResizeWidth();
301+
result = result * PRIME + this.getDefaultImagePipelineResizeHeight();
302+
result = result * PRIME + (this.isDefaultImagePipelineCenterCrop() ? 79 : 97);
303+
final Object $sentenceTokenizerMaxLength = this.getSentenceTokenizerMaxLength();
304+
result = result * PRIME + ($sentenceTokenizerMaxLength == null ?
305+
43 :
306+
$sentenceTokenizerMaxLength.hashCode());
307+
final Object $sentenceTokenizerModelMaxLength = this.getSentenceTokenizerModelMaxLength();
308+
result = result * PRIME + ($sentenceTokenizerModelMaxLength == null ?
309+
43 :
310+
$sentenceTokenizerModelMaxLength.hashCode());
311+
final Object $sentenceTokenizerModel = this.getSentenceTokenizerModel();
312+
result = result * PRIME + ($sentenceTokenizerModel == null ? 43 : $sentenceTokenizerModel.hashCode());
313+
final Object $faceDetectionModelEngine = this.getFaceDetectionModelEngine();
314+
result = result * PRIME + ($faceDetectionModelEngine == null ? 43 : $faceDetectionModelEngine.hashCode());
315+
final Object $faceDetectionModelName = this.getFaceDetectionModelName();
316+
result = result * PRIME + ($faceDetectionModelName == null ? 43 : $faceDetectionModelName.hashCode());
317+
final Object $faceDetectionModelModelUrls = this.getFaceDetectionModelModelUrls();
318+
result = result * PRIME + ($faceDetectionModelModelUrls == null ?
319+
43 :
320+
$faceDetectionModelModelUrls.hashCode());
321+
final Object $faceEmbeddingModelEngine = this.getFaceEmbeddingModelEngine();
322+
result = result * PRIME + ($faceEmbeddingModelEngine == null ? 43 : $faceEmbeddingModelEngine.hashCode());
323+
final Object $faceEmbeddingModelName = this.getFaceEmbeddingModelName();
324+
result = result * PRIME + ($faceEmbeddingModelName == null ? 43 : $faceEmbeddingModelName.hashCode());
325+
final Object $faceEmbeddingModelModelUrls = this.getFaceEmbeddingModelModelUrls();
326+
result = result * PRIME + ($faceEmbeddingModelModelUrls == null ?
327+
43 :
328+
$faceEmbeddingModelModelUrls.hashCode());
329+
return result;
330+
}
331+
332+
public String toString() {
333+
return "RedisOMSpringProperties.Djl(enabled=" + this.isEnabled() + ", imageEmbeddingModelEngine=" + this.getImageEmbeddingModelEngine() + ", imageEmbeddingModelModelUrls=" + this.getImageEmbeddingModelModelUrls() + ", defaultImagePipelineResizeWidth=" + this.getDefaultImagePipelineResizeWidth() + ", defaultImagePipelineResizeHeight=" + this.getDefaultImagePipelineResizeHeight() + ", defaultImagePipelineCenterCrop=" + this.isDefaultImagePipelineCenterCrop() + ", sentenceTokenizerMaxLength=" + this.getSentenceTokenizerMaxLength() + ", sentenceTokenizerModelMaxLength=" + this.getSentenceTokenizerModelMaxLength() + ", sentenceTokenizerModel=" + this.getSentenceTokenizerModel() + ", faceDetectionModelEngine=" + this.getFaceDetectionModelEngine() + ", faceDetectionModelName=" + this.getFaceDetectionModelName() + ", faceDetectionModelModelUrls=" + this.getFaceDetectionModelModelUrls() + ", faceEmbeddingModelEngine=" + this.getFaceEmbeddingModelEngine() + ", faceEmbeddingModelName=" + this.getFaceEmbeddingModelName() + ", faceEmbeddingModelModelUrls=" + this.getFaceEmbeddingModelModelUrls() + ")";
334+
}
80335
}
81336

82337
private final Djl djl = new Djl();

‎redis-om-spring/src/main/java/com/redis/om/spring/metamodel/MetamodelGenerator.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,9 @@
2222
import javax.lang.model.SourceVersion;
2323
import javax.lang.model.element.*;
2424
import javax.lang.model.type.DeclaredType;
25-
import javax.lang.model.type.TypeKind;
2625
import javax.lang.model.type.TypeMirror;
27-
import javax.lang.model.util.Elements;
2826
import javax.lang.model.util.Types;
2927
import javax.tools.Diagnostic;
30-
import javax.tools.Diagnostic.Kind;
3128
import javax.tools.JavaFileObject;
3229
import java.io.IOException;
3330
import java.io.Writer;

‎redis-om-spring/src/main/java/com/redis/om/spring/ops/RedisModulesOperations.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.redis.om.spring.ops;
22

3-
import com.google.gson.GsonBuilder;
43
import com.redis.om.spring.client.RedisModulesClient;
54
import com.redis.om.spring.ops.json.JSONOperations;
65
import com.redis.om.spring.ops.json.JSONOperationsImpl;

0 commit comments

Comments
 (0)