Skip to content

Commit bd62173

Browse files
committed
feat: update contact cassandra sample
Signed-off-by: Otavio Santana <[email protected]>
1 parent c651f85 commit bd62173

File tree

20 files changed

+98
-99
lines changed

20 files changed

+98
-99
lines changed

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ b) in the case of each subsequent Contributor:
1313
i) changes to the Program, and
1414
ii) additions to the Program;
1515
where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
16-
"Contributor" means any person or entity that distributes the Program.
16+
"Contributor" means any contact or entity that distributes the Program.
1717

1818
"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
1919

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
query.1=insert person {"_id": 1, "name": "Diana"}
2-
query.2=insert person {"_id": 2, "name": "Artemis"}
1+
query.1=insert contact {"_id": 1, "name": "Diana"}
2+
query.2=insert contact {"_id": 2, "name": "Artemis"}
33
id.name=_id

jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/mapping/CassandraColumnEntityConverterTest.java

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.eclipse.jnosql.databases.cassandra.mapping.model.Actor;
2424
import org.eclipse.jnosql.databases.cassandra.mapping.model.AppointmentBook;
2525
import org.eclipse.jnosql.databases.cassandra.mapping.model.Artist;
26-
import org.eclipse.jnosql.databases.cassandra.mapping.model.Contact;
2726
import org.eclipse.jnosql.databases.cassandra.mapping.model.Director;
2827
import org.eclipse.jnosql.databases.cassandra.mapping.model.History2;
2928
import org.eclipse.jnosql.databases.cassandra.mapping.model.Job;
@@ -284,12 +283,12 @@ public void shouldSupportUDT() {
284283
address.setCity("California");
285284
address.setStreet("Street");
286285

287-
Person person = new Person();
288-
person.setAge(10);
289-
person.setName("Ada");
290-
person.setHome(address);
286+
Contact contact = new Contact();
287+
contact.setAge(10);
288+
contact.setName("Ada");
289+
contact.setHome(address);
291290

292-
var entity = converter.toCommunication(person);
291+
var entity = converter.toCommunication(contact);
293292
assertEquals("Person", entity.name());
294293
Element column = entity.find("home").get();
295294
UDT udt = UDT.class.cast(column);
@@ -313,11 +312,11 @@ public void shouldSupportUDTToEntity() {
313312
.addUDT(columns).build();
314313
entity.add(udt);
315314

316-
Person person = converter.toEntity(entity);
317-
assertNotNull(person);
318-
Address home = person.getHome();
319-
assertEquals("Poliana", person.getName());
320-
assertEquals(Integer.valueOf(20), person.getAge());
315+
Contact contact = converter.toEntity(entity);
316+
assertNotNull(contact);
317+
Address home = contact.getHome();
318+
assertEquals("Poliana", contact.getName());
319+
assertEquals(Integer.valueOf(20), contact.getAge());
321320
assertEquals("Salvador", home.getCity());
322321
assertEquals("Jose Anasoh", home.getStreet());
323322

@@ -343,8 +342,8 @@ public void shouldSupportTimeStampConverter() {
343342
public void shouldConvertListUDT() {
344343
AppointmentBook appointmentBook = new AppointmentBook();
345344
appointmentBook.setUser("otaviojava");
346-
appointmentBook.setContacts(asList(new Contact("Poliana", "[email protected]"),
347-
new Contact("Ada", "[email protected]")));
345+
appointmentBook.setContacts(asList(new org.eclipse.jnosql.databases.cassandra.mapping.model.Contact("Poliana", "[email protected]"),
346+
new org.eclipse.jnosql.databases.cassandra.mapping.model.Contact("Ada", "[email protected]")));
348347

349348
var entity = converter.toCommunication(appointmentBook);
350349
assertEquals("AppointmentBook", entity.name());
@@ -370,11 +369,11 @@ public void shouldConvertListUDTToEntity() {
370369
entity.add(Element.of("user", "otaviojava"));
371370
entity.add(UDT.builder("Contact").withName("contacts").addUDTs(columns).build());
372371
AppointmentBook appointmentBook = converter.toEntity(entity);
373-
List<Contact> contacts = appointmentBook.getContacts();
372+
List<org.eclipse.jnosql.databases.cassandra.mapping.model.Contact> contacts = appointmentBook.getContacts();
374373
assertEquals("otaviojava", appointmentBook.getUser());
375374

376-
assertThat(contacts).contains(new Contact("Poliana", "poliana"),
377-
new Contact("Ada", "[email protected]"));
375+
assertThat(contacts).contains(new org.eclipse.jnosql.databases.cassandra.mapping.model.Contact("Poliana", "poliana"),
376+
new org.eclipse.jnosql.databases.cassandra.mapping.model.Contact("Ada", "[email protected]"));
378377

379378

380379
}

jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/mapping/CassandraExtensionTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public class CassandraExtensionTest {
3838

3939

4040
@Inject
41-
private PersonRepository repository;
41+
private ContactRepository repository;
4242

4343
@Test
4444
public void shouldSaveCassandra() {

jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/mapping/CassandraRepositoryProxyTest.java

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ public void setUp() {
6868
CassandraRepositoryProxy handler = new CassandraRepositoryProxy(template,
6969
PersonRepository.class, converters, entitiesMetadata);
7070

71-
when(template.insert(any(Person.class))).thenReturn(new Person());
72-
when(template.insert(any(Person.class), any(Duration.class))).thenReturn(new Person());
73-
when(template.update(any(Person.class))).thenReturn(new Person());
71+
when(template.insert(any(Contact.class))).thenReturn(new Contact());
72+
when(template.insert(any(Contact.class), any(Duration.class))).thenReturn(new Contact());
73+
when(template.update(any(Contact.class))).thenReturn(new Contact());
7474
this.personRepository = (PersonRepository) Proxy.newProxyInstance(PersonRepository.class.getClassLoader(),
7575
new Class[]{PersonRepository.class},
7676
handler);
@@ -113,45 +113,45 @@ public void shouldFindByName2CQL() {
113113

114114
@Test
115115
public void shouldSaveUsingInsert() {
116-
Person person = new Person("Ada", 10);
117-
personRepository.save(person);
118-
verify(template).insert(eq(person));
116+
Contact contact = new Contact("Ada", 10);
117+
personRepository.save(contact);
118+
verify(template).insert(eq(contact));
119119
}
120120

121121
@Test
122122
public void shouldSaveUsingUpdate() {
123-
Person person = new Person("Ada-2", 10);
124-
when(template.find(Person.class, "Ada-2")).thenReturn(Optional.of(person));
125-
personRepository.save(person);
126-
verify(template).update(eq(person));
123+
Contact contact = new Contact("Ada-2", 10);
124+
when(template.find(Contact.class, "Ada-2")).thenReturn(Optional.of(contact));
125+
personRepository.save(contact);
126+
verify(template).update(eq(contact));
127127
}
128128

129129
@Test
130130
public void shouldDelete(){
131131
personRepository.deleteById("id");
132-
verify(template).delete(Person.class, "id");
132+
verify(template).delete(Contact.class, "id");
133133
}
134134

135135

136136
@Test
137137
public void shouldDeleteEntity(){
138-
Person person = new Person("Ada", 10);
139-
personRepository.delete(person);
140-
verify(template).delete(Person.class, person.getName());
138+
Contact contact = new Contact("Ada", 10);
139+
personRepository.delete(contact);
140+
verify(template).delete(Contact.class, contact.getName());
141141
}
142142

143-
interface PersonRepository extends CassandraRepository<Person, String> {
143+
interface PersonRepository extends CassandraRepository<Contact, String> {
144144

145145
void deleteByName(String namel);
146146

147147
@CQL("select * from Person")
148-
List<Person> findAllQuery();
148+
List<Contact> findAllQuery();
149149

150150
@CQL("select * from Person where name = ?")
151-
List<Person> findByName(String name);
151+
List<Contact> findByName(String name);
152152

153153
@CQL("select * from Person where name = :name")
154-
List<Person> findByName2(@Param("name") String name);
154+
List<Contact> findByName2(@Param("name") String name);
155155
}
156156

157157
}
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import java.util.Objects;
2323

2424
@Entity
25-
public class Person {
25+
public class Contact {
2626

2727
@Id("name")
2828
private String name;
@@ -57,21 +57,21 @@ public void setHome(Address home) {
5757
this.home = home;
5858
}
5959

60-
public Person(String name, Integer age) {
60+
public Contact(String name, Integer age) {
6161
this.name = name;
6262
this.age = age;
6363
}
6464

65-
public Person() {
65+
public Contact() {
6666
}
6767

6868
@Override
6969
public boolean equals(Object o) {
7070
if (this == o) return true;
7171
if (o == null || getClass() != o.getClass()) return false;
72-
Person person = (Person) o;
73-
return Objects.equals(name, person.name) &&
74-
Objects.equals(age, person.age);
72+
Contact contact = (Contact) o;
73+
return Objects.equals(name, contact.name) &&
74+
Objects.equals(age, contact.age);
7575
}
7676

7777
@Override
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@
1818
import jakarta.data.repository.Repository;
1919

2020
@Repository
21-
public interface PersonRepository extends CassandraRepository<Person, String> {
21+
public interface ContactRepository extends CassandraRepository<Contact, String> {
2222
}

jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/mapping/DefaultCassandraTemplateTest.java

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,10 @@ void shouldSaveConsistency() {
100100
save(Mockito.any(CommunicationEntity.class), Mockito.eq(level)))
101101
.thenReturn(entity);
102102

103-
Person person = new Person();
104-
person.setName("Name");
105-
person.setAge(20);
106-
assertEquals(person, template.save(person, level));
103+
Contact contact = new Contact();
104+
contact.setName("Name");
105+
contact.setAge(20);
106+
assertEquals(contact, template.save(contact, level));
107107

108108
Mockito.verify(manager).save(captor.capture(), Mockito.eq(level));
109109
assertEquals(entity, captor.getValue());
@@ -122,10 +122,10 @@ void shouldSaveConsistencyIterable() {
122122
save(Mockito.any(CommunicationEntity.class), Mockito.eq(level)))
123123
.thenReturn(entity);
124124

125-
Person person = new Person();
126-
person.setName("Name");
127-
person.setAge(20);
128-
assertThat(template.save(Collections.singletonList(person), level)).contains(person);
125+
Contact contact = new Contact();
126+
contact.setName("Name");
127+
contact.setAge(20);
128+
assertThat(template.save(Collections.singletonList(contact), level)).contains(contact);
129129
Mockito.verify(manager).save(captor.capture(), Mockito.eq(level));
130130
assertEquals(entity, captor.getValue());
131131

@@ -144,10 +144,10 @@ void shouldSaveConsistencyDuration() {
144144
Mockito.eq(level)))
145145
.thenReturn(entity);
146146

147-
Person person = new Person();
148-
person.setName("Name");
149-
person.setAge(20);
150-
assertEquals(person, template.save(person, duration, level));
147+
Contact contact = new Contact();
148+
contact.setName("Name");
149+
contact.setAge(20);
150+
assertEquals(contact, template.save(contact, duration, level));
151151

152152
Mockito.verify(manager).save(captor.capture(), Mockito.eq(duration), Mockito.eq(level));
153153
assertEquals(entity, captor.getValue());
@@ -166,10 +166,10 @@ void shouldSaveConsistencyDurationIterable() {
166166
Mockito.eq(level)))
167167
.thenReturn(entity);
168168

169-
Person person = new Person();
170-
person.setName("Name");
171-
person.setAge(20);
172-
assertThat(template.save(Collections.singletonList(person), duration, level)).contains(person);
169+
Contact contact = new Contact();
170+
contact.setName("Name");
171+
contact.setAge(20);
172+
assertThat(template.save(Collections.singletonList(contact), duration, level)).contains(contact);
173173
Mockito.verify(manager).save(captor.capture(), Mockito.eq(duration), Mockito.eq(level));
174174
assertEquals(entity, captor.getValue());
175175
}
@@ -186,45 +186,45 @@ void shouldDelete() {
186186

187187
@Test
188188
void shouldFind() {
189-
Person person = new Person();
190-
person.setName("Name");
191-
person.setAge(20);
189+
Contact contact = new Contact();
190+
contact.setName("Name");
191+
contact.setAge(20);
192192

193193
CommunicationEntity entity = CommunicationEntity.of("Person", asList(Element.of("name", "Name"), Element.of("age", 20)));
194194
SelectQuery query = select().from("columnFamily").build();
195195
ConsistencyLevel level = ConsistencyLevel.THREE;
196196
when(manager.select(query, level)).thenReturn(Stream.of(entity));
197197

198-
Stream<Person> people = template.find(query, level);
199-
assertThat(people.collect(Collectors.toList())).contains(person);
198+
Stream<Contact> people = template.find(query, level);
199+
assertThat(people.collect(Collectors.toList())).contains(contact);
200200
}
201201

202202
@Test
203203
void shouldFindCQL() {
204-
Person person = new Person();
205-
person.setName("Name");
206-
person.setAge(20);
204+
Contact contact = new Contact();
205+
contact.setName("Name");
206+
contact.setAge(20);
207207
String cql = "select * from Person";
208208
CommunicationEntity entity = CommunicationEntity.of("Person", asList(Element.of("name", "Name"), Element.of("age", 20)));
209209

210210
when(manager.cql(cql)).thenReturn(Stream.of(entity));
211211

212-
List<Person> people = template.<Person>cql(cql).collect(Collectors.toList());
213-
Assertions.assertThat(people).contains(person);
212+
List<Contact> people = template.<Contact>cql(cql).collect(Collectors.toList());
213+
Assertions.assertThat(people).contains(contact);
214214
}
215215

216216
@Test
217217
void shouldFindSimpleStatement() {
218218
SimpleStatement statement = QueryBuilder.selectFrom("Person").all().build();
219-
Person person = new Person();
220-
person.setName("Name");
221-
person.setAge(20);
219+
Contact contact = new Contact();
220+
contact.setName("Name");
221+
contact.setAge(20);
222222
CommunicationEntity entity = CommunicationEntity.of("Person", asList(Element.of("name", "Name"), Element.of("age", 20)));
223223

224224
when(manager.execute(statement)).thenReturn(Stream.of(entity));
225225

226-
List<Person> people = template.<Person>execute(statement).collect(Collectors.toList());
227-
Assertions.assertThat(people).contains(person);
226+
List<Contact> people = template.<Contact>execute(statement).collect(Collectors.toList());
227+
Assertions.assertThat(people).contains(contact);
228228
}
229229

230230
}

jnosql-cassandra/src/test/resources/cassandra.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ jnosql.cassandra.query.4=CREATE COLUMNFAMILY IF NOT EXISTS newKeySpace.users ( n
77
jnosql.cassandra.query.5=CREATE COLUMNFAMILY IF NOT EXISTS newKeySpace.history ( name text PRIMARY KEY, dataStart date, dateEnd timestamp);
88
jnosql.cassandra.query.6=CREATE COLUMNFAMILY IF NOT EXISTS newKeySpace.contacts ( user text PRIMARY KEY, names list<frozen <fullname>>);
99
jnosql.cassandra.query.7=CREATE COLUMNFAMILY IF NOT EXISTS newKeySpace.agenda ( user text PRIMARY KEY, names set<frozen <fullname>>);
10-
jnosql.cassandra.query.8=CREATE COLUMNFAMILY IF NOT EXISTS newKeySpace.person ( id bigint PRIMARY KEY, name text);
10+
jnosql.cassandra.query.8=CREATE COLUMNFAMILY IF NOT EXISTS newKeySpace.contact ( id bigint PRIMARY KEY, name text);
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
query.1=insert person {"id": 1, "name": "Diana"}
2-
query.2=insert person {"id": 2, "name": "Artemis"}
1+
query.1=insert contact {"id": 1, "name": "Diana"}
2+
query.2=insert contact {"id": 2, "name": "Artemis"}
33
id.name=id

0 commit comments

Comments
 (0)