Skip to content

Commit 5417790

Browse files
authored
Merge pull request #269 from eclipse/update-api-nosql
Update NoSQL API
2 parents f0f1fff + 68cfb25 commit 5417790

File tree

62 files changed

+94
-314
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+94
-314
lines changed

CHANGELOG.adoc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ and this project adheres to https://semver.org/spec/v2.0.0.html[Semantic Version
1818
- Update Testcontainer to 1.19.6
1919
- Upgrade Jakarta Data to version 1.0.0-M3
2020

21+
=== Removed
22+
23+
- Remove the `UDT` annotation and use `Column` annotation instead.
24+
2125
== [1.1.0] - 2023-02-05
2226

2327
=== Changed

README.adoc

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -265,9 +265,9 @@ interface PersonRepository extends CassandraRepository<Person, String> {
265265
----
266266

267267

268-
=== @UDT
268+
=== UDT at Column annotation
269269

270-
The ```@UDT``` annotation is a mapping annotation that allows defining a field to be stored as a user-defined type in Cassandra.
270+
The ```@Column``` contains a UDT attribute for mapping annotation that allows defining a field to be stored as a user-defined type in Cassandra.
271271

272272
[source,java]
273273
----
@@ -280,8 +280,7 @@ public class Person {
280280
@Column
281281
private Integer age;
282282
283-
@UDT("address")
284-
@Column
283+
@Column(udt="address")
285284
private Address home;
286285
}
287286
----

jnosql-arangodb/src/main/java/org/eclipse/jnosql/databases/arangodb/communication/ArangoDBUtil.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
import com.arangodb.entity.BaseDocument;
2020
import com.arangodb.entity.CollectionEntity;
2121
import org.eclipse.jnosql.communication.Value;
22-
import org.eclipse.jnosql.communication.driver.ValueUtil;
22+
23+
import org.eclipse.jnosql.communication.ValueUtil;
2324
import org.eclipse.jnosql.communication.semistructured.CommunicationEntity;
2425
import org.eclipse.jnosql.communication.semistructured.Element;
2526

jnosql-arangodb/src/main/java/org/eclipse/jnosql/databases/arangodb/communication/QueryAQLConverter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import jakarta.data.Direction;
1818
import jakarta.data.Sort;
1919
import org.eclipse.jnosql.communication.TypeReference;
20-
import org.eclipse.jnosql.communication.driver.ValueUtil;
20+
import org.eclipse.jnosql.communication.ValueUtil;
2121
import org.eclipse.jnosql.communication.semistructured.CriteriaCondition;
2222
import org.eclipse.jnosql.communication.semistructured.DeleteQuery;
2323
import org.eclipse.jnosql.communication.semistructured.Element;

jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/ArangoDBTemplateIntegrationTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import org.assertj.core.api.SoftAssertions;
2020
import org.eclipse.jnosql.databases.arangodb.communication.ArangoDBConfigurations;
2121
import org.eclipse.jnosql.databases.arangodb.mapping.ArangoDBTemplate;
22-
import org.eclipse.jnosql.mapping.Convert;
22+
import org.eclipse.jnosql.mapping.Database;
2323
import org.eclipse.jnosql.mapping.core.Converters;
2424
import org.eclipse.jnosql.mapping.core.config.MappingConfigurations;
2525
import org.eclipse.jnosql.mapping.document.DocumentTemplate;
@@ -42,7 +42,7 @@
4242
import static org.eclipse.jnosql.databases.arangodb.communication.DocumentDatabase.INSTANCE;
4343

4444
@EnableAutoWeld
45-
@AddPackages(value = {Convert.class, EntityConverter.class, DocumentTemplate.class})
45+
@AddPackages(value = {Database.class, EntityConverter.class, DocumentTemplate.class})
4646
@AddPackages(Book.class)
4747
@AddPackages(ArangoDBTemplate.class)
4848
@AddExtensions({EntityMetadataExtension.class,

jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/TemplateIntegrationTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import org.assertj.core.api.SoftAssertions;
2020
import org.eclipse.jnosql.databases.arangodb.communication.ArangoDBConfigurations;
2121
import org.eclipse.jnosql.databases.arangodb.communication.DocumentDatabase;
22-
import org.eclipse.jnosql.mapping.Convert;
22+
import org.eclipse.jnosql.mapping.Database;
2323
import org.eclipse.jnosql.mapping.core.Converters;
2424
import org.eclipse.jnosql.mapping.core.config.MappingConfigurations;
2525
import org.eclipse.jnosql.mapping.document.DocumentTemplate;
@@ -43,7 +43,7 @@
4343
import static org.eclipse.jnosql.databases.arangodb.integration.StepTransitionReason.REPEAT;
4444

4545
@EnableAutoWeld
46-
@AddPackages(value = {Convert.class, EntityConverter.class, DocumentTemplate.class})
46+
@AddPackages(value = {Database.class, EntityConverter.class, DocumentTemplate.class})
4747
@AddPackages(Book.class)
4848
@AddExtensions({EntityMetadataExtension.class,
4949
DocumentExtension.class})

jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/integration/Transition.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
package org.eclipse.jnosql.databases.arangodb.integration;
1616

1717
import jakarta.nosql.Column;
18-
import org.eclipse.jnosql.mapping.Embeddable;
18+
import jakarta.nosql.Embeddable;
1919

2020
import java.util.List;
2121

jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/mapping/ArangoDBExtensionTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
package org.eclipse.jnosql.databases.arangodb.mapping;
1616

1717
import jakarta.inject.Inject;
18-
import org.eclipse.jnosql.mapping.Convert;
18+
import org.eclipse.jnosql.mapping.Database;
1919
import org.eclipse.jnosql.mapping.document.spi.DocumentExtension;
2020
import org.eclipse.jnosql.mapping.keyvalue.spi.KeyValueExtension;
2121
import org.eclipse.jnosql.mapping.reflection.Reflections;
@@ -29,7 +29,7 @@
2929
import org.mockito.junit.jupiter.MockitoExtension;
3030

3131
@EnableAutoWeld
32-
@AddPackages(value = {Convert.class})
32+
@AddPackages(value = {Database.class})
3333
@AddPackages(MockProducer.class)
3434
@AddPackages(Reflections.class)
3535
@AddExtensions({EntityMetadataExtension.class, KeyValueExtension.class,

jnosql-cassandra/src/main/java/org/eclipse/jnosql/databases/cassandra/communication/QueryUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
import jakarta.data.Sort;
4040
import org.eclipse.jnosql.communication.CommunicationException;
4141
import org.eclipse.jnosql.communication.Value;
42-
import org.eclipse.jnosql.communication.driver.ValueUtil;
42+
import org.eclipse.jnosql.communication.ValueUtil;
4343
import org.eclipse.jnosql.communication.semistructured.CommunicationEntity;
4444
import org.eclipse.jnosql.communication.semistructured.Element;
4545
import org.eclipse.jnosql.communication.semistructured.SelectQuery;

jnosql-cassandra/src/main/java/org/eclipse/jnosql/databases/cassandra/communication/Relations.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.eclipse.jnosql.communication.Condition;
2121
import org.eclipse.jnosql.communication.TypeReference;
2222
import org.eclipse.jnosql.communication.Value;
23-
import org.eclipse.jnosql.communication.driver.ValueUtil;
23+
import org.eclipse.jnosql.communication.ValueUtil;
2424
import org.eclipse.jnosql.communication.semistructured.CriteriaCondition;
2525
import org.eclipse.jnosql.communication.semistructured.Element;
2626

0 commit comments

Comments
 (0)