Skip to content

Commit 3316a26

Browse files
nickkkcccnickkkccc
committed
refactor(spring-data-40): simple source refactoring
1 parent dd9cc38 commit 3316a26

28 files changed

+70
-69
lines changed

‎tarantool-spring-data/tarantool-spring-data-40/src/main/java/io/tarantool/spring/data40/TarantoolBoxKeyValueAdapter.java‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
import java.util.Map;
99

10+
import org.jspecify.annotations.NonNull;
1011
import org.springframework.data.keyvalue.core.AbstractKeyValueAdapter;
1112
import org.springframework.data.util.CloseableIterator;
12-
import org.springframework.lang.NonNull;
1313

1414
import io.tarantool.client.box.TarantoolBoxClient;
1515
import io.tarantool.spring.data.ProxyTarantoolBoxKeyValueAdapter;
@@ -23,32 +23,33 @@ public TarantoolBoxKeyValueAdapter(@NonNull TarantoolBoxClient tarantoolBoxClien
2323
}
2424

2525
@Override
26-
public Object put(Object id, Object item, String keyspace) {
26+
public Object put(@NonNull Object id, @NonNull Object item, @NonNull String keyspace) {
2727
return adapter.put(id, item, keyspace);
2828
}
2929

3030
@Override
31-
public boolean contains(Object id, String keyspace) {
31+
public boolean contains(@NonNull Object id, @NonNull String keyspace) {
3232
return adapter.contains(id, keyspace);
3333
}
3434

3535
@Override
36-
public Object get(Object id, String keyspace) {
36+
public Object get(@NonNull Object id, @NonNull String keyspace) {
3737
return adapter.get(id, keyspace);
3838
}
3939

4040
@Override
41-
public Object delete(Object id, String keyspace) {
41+
public Object delete(@NonNull Object id, @NonNull String keyspace) {
4242
return adapter.delete(id, keyspace);
4343
}
4444

4545
@Override
46-
public Iterable<?> getAllOf(String keyspace) {
46+
@NonNull
47+
public Iterable<Object> getAllOf(@NonNull String keyspace) {
4748
return adapter.getAllOf(keyspace);
4849
}
4950

5051
@Override
51-
public void deleteAllOf(String keyspace) {
52+
public void deleteAllOf(@NonNull String keyspace) {
5253
adapter.deleteAllOf(keyspace);
5354
}
5455

@@ -58,7 +59,7 @@ public void clear() {
5859
}
5960

6061
@Override
61-
public long count(String keyspace) {
62+
public long count(@NonNull String keyspace) {
6263
return adapter.count(keyspace);
6364
}
6465

@@ -68,7 +69,8 @@ public void destroy() throws Exception {
6869
}
6970

7071
@Override
71-
public CloseableIterator<Map.Entry<Object, Object>> entries(String keyspace) {
72+
@NonNull
73+
public CloseableIterator<Map.Entry<Object, Object>> entries(@NonNull String keyspace) {
7274
throw new UnsupportedOperationException("Not implemented yet");
7375
}
7476
}

‎tarantool-spring-data/tarantool-spring-data-40/src/main/java/io/tarantool/spring/data40/TarantoolCrudKeyValueAdapter.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
import java.util.Map.Entry;
1010

1111
import com.fasterxml.jackson.annotation.JsonFormat;
12+
import org.jspecify.annotations.NonNull;
1213
import org.springframework.core.annotation.AnnotatedElementUtils;
1314
import org.springframework.data.keyvalue.core.AbstractKeyValueAdapter;
1415
import org.springframework.data.util.CloseableIterator;
15-
import org.springframework.lang.NonNull;
1616

1717
import io.tarantool.client.crud.TarantoolCrudClient;
1818
import io.tarantool.spring.data.ProxyTarantoolCrudKeyValueAdapter;
@@ -28,37 +28,38 @@ public TarantoolCrudKeyValueAdapter(@NonNull TarantoolCrudClient client) {
2828
}
2929

3030
@Override
31-
public Object put(Object id, Object item, String keyspace) {
31+
public Object put(@NonNull Object id, @NonNull Object item, @NonNull String keyspace) {
3232
return adapter.put(convertId(id), item, keyspace);
3333
}
3434

3535
@Override
36-
public boolean contains(Object id, String keyspace) {
36+
public boolean contains(@NonNull Object id, @NonNull String keyspace) {
3737
return adapter.contains(convertId(id), keyspace);
3838
}
3939

4040
@Override
41-
public Object get(Object id, String keyspace) {
41+
public Object get(@NonNull Object id, @NonNull String keyspace) {
4242
return adapter.get(convertId(id), keyspace);
4343
}
4444

4545
@Override
46-
public <T> T get(Object id, String keyspace, Class<T> type) {
46+
public <T> T get(@NonNull Object id, @NonNull String keyspace, @NonNull Class<T> type) {
4747
return adapter.get(convertId(id), keyspace, type);
4848
}
4949

5050
@Override
51-
public Object delete(Object id, String keyspace) {
51+
public Object delete(@NonNull Object id, @NonNull String keyspace) {
5252
return adapter.delete(convertId(id), keyspace);
5353
}
5454

5555
@Override
56-
public <T> T delete(Object id, String keyspace, Class<T> type) {
56+
public <T> T delete(@NonNull Object id, @NonNull String keyspace, @NonNull Class<T> type) {
5757
return adapter.delete(convertId(id), keyspace, type);
5858
}
5959

6060
@Override
61-
public Iterable<?> getAllOf(String keyspace) {
61+
@NonNull
62+
public Iterable<Object> getAllOf(@NonNull String keyspace) {
6263
return adapter.getAllOf(keyspace);
6364
}
6465

‎tarantool-spring-data/tarantool-spring-data-40/src/main/java/io/tarantool/spring/data40/TarantoolQueryEngine.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
import java.util.Comparator;
1010
import java.util.Map.Entry;
1111

12+
import org.jspecify.annotations.NonNull;
13+
import org.jspecify.annotations.Nullable;
1214
import org.springframework.data.keyvalue.core.QueryEngine;
13-
import org.springframework.lang.NonNull;
14-
import org.springframework.lang.Nullable;
1515

1616
import io.tarantool.client.crud.TarantoolCrudClient;
1717
import io.tarantool.spring.data.ProxyTarantoolQueryEngine;

‎tarantool-spring-data/tarantool-spring-data-40/src/main/java/io/tarantool/spring/data40/config/package-info.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
/** Config package. */
2-
@org.springframework.lang.NonNullApi
2+
@org.jspecify.annotations.NullMarked
33
package io.tarantool.spring.data40.config;

‎tarantool-spring-data/tarantool-spring-data-40/src/main/java/io/tarantool/spring/data40/core/annotation/DefaultIdClassResolver.java‎

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

66
package io.tarantool.spring.data40.core.annotation;
77

8+
import org.jspecify.annotations.Nullable;
89
import org.springframework.core.annotation.AnnotatedElementUtils;
9-
import org.springframework.lang.Nullable;
1010
import org.springframework.util.Assert;
1111

1212
import io.tarantool.spring.data.core.annotation.IdClass;
@@ -22,7 +22,7 @@ public enum DefaultIdClassResolver implements IdClassResolver {
2222

2323
@Nullable
2424
@Override
25-
public Class<?> resolveIdClassType(Class<?> type) {
25+
public Class<?> resolveIdClassType(@Nullable Class<?> type) {
2626
Assert.notNull(type, "Type for IdClass must be not null!");
2727

2828
IdClass idClassTypeAnnotation = AnnotatedElementUtils.findMergedAnnotation(type, IdClass.class);

‎tarantool-spring-data/tarantool-spring-data-40/src/main/java/io/tarantool/spring/data40/core/annotation/package-info.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
/** Core annotations of data mapping. */
2-
@org.springframework.lang.NonNullFields
3-
@org.springframework.lang.NonNullApi
2+
@org.jspecify.annotations.NullMarked
43
package io.tarantool.spring.data40.core.annotation;

‎tarantool-spring-data/tarantool-spring-data-40/src/main/java/io/tarantool/spring/data40/core/mapping/BasicKeyValueCompositePersistentEntity.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
import java.util.List;
1111
import java.util.Map;
1212

13+
import org.jspecify.annotations.Nullable;
14+
import org.springframework.data.core.TypeInformation;
1315
import org.springframework.data.domain.Persistable;
1416
import org.springframework.data.keyvalue.core.mapping.BasicKeyValuePersistentEntity;
1517
import org.springframework.data.keyvalue.core.mapping.KeySpaceResolver;
1618
import org.springframework.data.mapping.IdentifierAccessor;
1719
import org.springframework.data.mapping.PersistentEntity;
1820
import org.springframework.data.support.IsNewStrategy;
19-
import org.springframework.data.util.TypeInformation;
20-
import org.springframework.lang.Nullable;
2121
import org.springframework.util.Assert;
2222

2323
import io.tarantool.spring.data.core.annotation.IdClass;

‎tarantool-spring-data/tarantool-spring-data-40/src/main/java/io/tarantool/spring/data40/core/mapping/TarantoolMappingContext.java‎

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

66
package io.tarantool.spring.data40.core.mapping;
77

8+
import org.jspecify.annotations.Nullable;
9+
import org.springframework.data.core.TypeInformation;
810
import org.springframework.data.keyvalue.core.mapping.BasicKeyValuePersistentEntity;
911
import org.springframework.data.keyvalue.core.mapping.KeySpaceResolver;
1012
import org.springframework.data.keyvalue.core.mapping.KeyValuePersistentEntity;
1113
import org.springframework.data.keyvalue.core.mapping.KeyValuePersistentProperty;
1214
import org.springframework.data.keyvalue.core.mapping.context.KeyValueMappingContext;
1315
import org.springframework.data.mapping.model.Property;
1416
import org.springframework.data.mapping.model.SimpleTypeHolder;
15-
import org.springframework.data.util.TypeInformation;
16-
import org.springframework.lang.Nullable;
1717

1818
import io.tarantool.spring.data.core.annotation.IdClassResolver;
1919
import io.tarantool.spring.data40.core.annotation.DefaultIdClassResolver;

‎tarantool-spring-data/tarantool-spring-data-40/src/main/java/io/tarantool/spring/data40/core/mapping/model/CompositeIdPropertyAccessor.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@
99
import java.lang.reflect.InvocationTargetException;
1010
import java.util.Map;
1111

12+
import org.jspecify.annotations.Nullable;
1213
import org.springframework.data.mapping.TargetAwareIdentifierAccessor;
13-
import org.springframework.lang.NonNull;
14-
import org.springframework.lang.Nullable;
1514
import org.springframework.util.Assert;
1615
import org.springframework.util.ReflectionUtils;
1716

@@ -27,7 +26,7 @@ public class CompositeIdPropertyAccessor extends TargetAwareIdentifierAccessor {
2726
private final Object target;
2827

2928
public CompositeIdPropertyAccessor(
30-
Object target, @NonNull Map<Field, Field> entityIdClassFields, Class<?> idClassType) {
29+
Object target, Map<Field, Field> entityIdClassFields, Class<?> idClassType) {
3130

3231
super(target);
3332
this.target = target;

‎tarantool-spring-data/tarantool-spring-data-40/src/main/java/io/tarantool/spring/data40/core/mapping/model/package-info.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
/** Core implementation of the mapping subsystem's model. */
2-
@org.springframework.lang.NonNullFields
3-
@org.springframework.lang.NonNullApi
2+
@org.jspecify.annotations.NullMarked
43
package io.tarantool.spring.data40.core.mapping.model;

0 commit comments

Comments
 (0)