Skip to content

Commit 9e850c8

Browse files
biozalbiozal
committed
updated signatures
1 parent 589a72d commit 9e850c8

File tree

8 files changed

+39
-21
lines changed

8 files changed

+39
-21
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,5 @@ hs_err_pid*
2929
.idea
3030

3131
*.swp
32+
33+
target/surefire-reports/

‎pom.xml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,12 @@
7070
<artifactId>java-client</artifactId>
7171
<version>${couchbase.version}</version>
7272
</dependency>
73-
74-
73+
<!-- https://mvnrepository.com/artifact/org.mindrot/jbcrypt -->
74+
<dependency>
75+
<groupId>org.mindrot</groupId>
76+
<artifactId>jbcrypt</artifactId>
77+
<version>0.3m</version>
78+
</dependency>
7579
<dependency>
7680
<groupId>org.junit.jupiter</groupId>
7781
<artifactId>junit-jupiter</artifactId>

‎src.iml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@
103103
<orderEntry type="library" name="Maven: com.couchbase.client:core-io:2.1.5" level="project" />
104104
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.4.5" level="project" />
105105
<orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
106+
<orderEntry type="library" name="Maven: org.mindrot:jbcrypt:0.3m" level="project" />
106107
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter:5.7.1" level="project" />
107108
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.7.1" level="project" />
108109
<orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />

‎src/main/java/org/couchbase/quickstart/controllers/ProfileController.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ public ResponseEntity<List<Profile>> getProfiles(
8484
})
8585
public ResponseEntity<Profile> getProfile(@RequestParam String pid) {
8686
Profile profile = profileCol.get(pid).contentAs(Profile.class);
87-
profile.setPid(pid);
8887
return ResponseEntity.status(HttpStatus.OK).body(profile);
8988
}
9089

‎src/main/java/org/couchbase/quickstart/models/Profile.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package org.couchbase.quickstart.models;
22

3+
import org.mindrot.jbcrypt.*;
4+
35
public class Profile {
46
private String pid;
57
private String firstName, lastName, email, password;
@@ -18,7 +20,7 @@ public class Profile {
1820

1921
public String getPassword() { return password; }
2022
public void setPassword(String password) {
21-
this.password = password;
23+
this.password = BCrypt.hashpw(password, BCrypt.gensalt());
2224
}
2325

2426
public Profile() { }

‎src/test/java/org/couchbase/quickstart/userProfile/UserProfileTest.java‎

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import org.couchbase.quickstart.configs.CollectionNames;
88
import org.couchbase.quickstart.configs.DBProperties;
99
import org.couchbase.quickstart.models.Profile;
10+
import org.couchbase.quickstart.models.ProfileRequest;
1011
import org.couchbase.quickstart.models.ProfileResult;
1112

1213
import org.hamcrest.MatcherAssert;
@@ -57,7 +58,7 @@ public void cleanDB() {
5758
public void testUserProfileNotFound() {
5859

5960
this.webTestClient.get()
60-
.uri("/api/v1/profiles?limit=5&skip=0&searchFirstName=Bob")
61+
.uri("/api/v1/profile?limit=5&skip=0&searchFirstName=Bob")
6162
.accept(MediaType.APPLICATION_JSON)
6263
.exchange()
6364
.expectStatus().is4xxClientError()
@@ -67,12 +68,12 @@ public void testUserProfileNotFound() {
6768
@Test
6869
public void testCreateUserProfile(){
6970
//test data
70-
Profile testProfile = getTestProfile();
71-
String json = getCreatedUserJson(testProfile);
71+
ProfileRequest createTestProfile = getCreateTestProfile();
72+
String json = getCreatedUserJson(createTestProfile);
7273

7374
//run the post test
7475
EntityExchangeResult<ProfileResult> profileResult = this.webTestClient.post()
75-
.uri("/api/v1/profiles/")
76+
.uri("/api/v1/profile/")
7677
.bodyValue(json)
7778
.accept(MediaType.APPLICATION_JSON)
7879
.header("Content-Type", "application/json; charset=utf-8")
@@ -85,10 +86,10 @@ public void testCreateUserProfile(){
8586
.get(profileResult.getResponseBody().getPid())
8687
.contentAs(Profile.class);
8788

88-
assertEquals(result.getFirstName(), testProfile.getFirstName());
89-
assertEquals(result.getLastName(), testProfile.getLastName());
90-
assertEquals(result.getEmail(), testProfile.getEmail());
91-
assertNotEquals(result.getPassword(), testProfile.getPassword());
89+
assertEquals(result.getFirstName(), createTestProfile.getFirstName());
90+
assertEquals(result.getLastName(), createTestProfile.getLastName());
91+
assertEquals(result.getEmail(), createTestProfile.getEmail());
92+
assertNotEquals(result.getPassword(), createTestProfile.getPassword());
9293
assertNotNull(result.getPid());
9394
}
9495

@@ -101,7 +102,7 @@ public void testListUsersSuccess() {
101102
bucket.collection(CollectionNames.PROFILE).insert(testProfile.getPid(), testProfile);
102103

103104
EntityExchangeResult<List<Profile>> profileListResult = this.webTestClient.get()
104-
.uri("/api/v1/profiles/?limit=5&skip=0&searchFirstName=Jam")
105+
.uri("/api/v1/profile/?limit=5&skip=0&searchFirstName=Jam")
105106
.accept(MediaType.APPLICATION_JSON)
106107
.exchange()
107108
.expectStatus().isOk()
@@ -128,7 +129,7 @@ public void testListUsersNoResult() {
128129
bucket.collection(CollectionNames.PROFILE).insert(testProfile.getPid(), testProfile);
129130

130131
EntityExchangeResult<List<Profile>> profileListResult = this.webTestClient.get()
131-
.uri("/api/v1/profiles/?limit=5&skip=0&searchFirstName=Jack")
132+
.uri("/api/v1/profile/?limit=5&skip=0&searchFirstName=Jack")
132133
.accept(MediaType.APPLICATION_JSON)
133134
.exchange()
134135
.expectStatus().isOk()
@@ -151,7 +152,7 @@ public void testDeleteUserProfile() {
151152

152153
//delete the user
153154
this.webTestClient.delete()
154-
.uri(String.format("/api/v1/profiles/%s", testProfile.getPid()))
155+
.uri(String.format("/api/v1/profile/%s", testProfile.getPid()))
155156
.accept(MediaType.APPLICATION_JSON)
156157
.header("Content-Type", "application/json; charset=utf-8")
157158
.exchange()
@@ -160,7 +161,7 @@ public void testDeleteUserProfile() {
160161
bucket.collection(CollectionNames.PROFILE).get(testProfile.getPid());
161162
}
162163

163-
private String getCreatedUserJson(Profile profile) {
164+
private String getCreatedUserJson(ProfileRequest profile) {
164165
//create json to post to integration test
165166
return JsonObject.create()
166167
.put("firstName", profile.getFirstName())
@@ -169,6 +170,14 @@ private String getCreatedUserJson(Profile profile) {
169170
.put("email", profile.getEmail()).toString();
170171
}
171172

173+
private ProfileRequest getCreateTestProfile() {
174+
return new ProfileRequest(
175+
"James",
176+
"Gosling",
177+
"password",
178+
"[email protected]");
179+
}
180+
172181
private Profile getTestProfile() {
173182
return new Profile(
174183
UUID.randomUUID().toString(),

‎target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
/Users/lebeaaa/Code/couchbase/java-springboot-quickstart/src/main/java/org/couchbase/quickstart/configs/Swagger.java
22
/Users/lebeaaa/Code/couchbase/java-springboot-quickstart/src/main/java/org/couchbase/quickstart/controllers/ProfileController.java
33
/Users/lebeaaa/Code/couchbase/java-springboot-quickstart/src/main/java/org/couchbase/quickstart/models/ProfileResult.java
4-
/Users/lebeaaa/Code/couchbase/java-springboot-quickstart/src/main/java/org/couchbase/quickstart/configs/DBProperties.java
54
/Users/lebeaaa/Code/couchbase/java-springboot-quickstart/src/main/java/org/couchbase/quickstart/configs/CollectionNames.java
6-
/Users/lebeaaa/Code/couchbase/java-springboot-quickstart/src/main/java/org/couchbase/quickstart/configs/CouchbaseConfig.java
75
/Users/lebeaaa/Code/couchbase/java-springboot-quickstart/src/main/java/org/couchbase/quickstart/models/Profile.java
8-
/Users/lebeaaa/Code/couchbase/java-springboot-quickstart/src/main/java/org/couchbase/quickstart/Application.java
96
/Users/lebeaaa/Code/couchbase/java-springboot-quickstart/src/main/java/org/couchbase/quickstart/runners/DBSetupRunner.java
107
/Users/lebeaaa/Code/couchbase/java-springboot-quickstart/src/main/java/org/couchbase/quickstart/models/ProfileList.java
118
/Users/lebeaaa/Code/couchbase/java-springboot-quickstart/src/main/java/org/couchbase/quickstart/controllers/HealthCheckController.java
9+
/Users/lebeaaa/Code/couchbase/java-springboot-quickstart/src/main/java/org/couchbase/quickstart/configs/DBProperties.java
10+
/Users/lebeaaa/Code/couchbase/java-springboot-quickstart/src/main/java/org/couchbase/quickstart/configs/CouchbaseConfig.java
11+
/Users/lebeaaa/Code/couchbase/java-springboot-quickstart/src/main/java/org/couchbase/quickstart/Application.java
12+
/Users/lebeaaa/Code/couchbase/java-springboot-quickstart/src/main/java/org/couchbase/quickstart/models/ProfileRequest.java
1213
/Users/lebeaaa/Code/couchbase/java-springboot-quickstart/src/main/java/org/couchbase/quickstart/controllers/IndexController.java

‎target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
/Users/denisrosa/Documents/Projects/java-springboot-quickstart/src/test/java/org/couchbase/quickstart/userProfile/UserProfileTest.java
2-
/Users/denisrosa/Documents/Projects/java-springboot-quickstart/src/test/java/org/couchbase/quickstart/healthCheck/HealthCheckApplicationTest.java
1+
/Users/lebeaaa/Code/couchbase/java-springboot-quickstart/src/test/java/org/couchbase/quickstart/healthCheck/HealthCheckApplicationTest.java
2+
/Users/lebeaaa/Code/couchbase/java-springboot-quickstart/src/test/java/org/couchbase/quickstart/userProfile/UserProfileTest.java

0 commit comments

Comments
 (0)