Skip to content

Commit 71fa2e6

Browse files
VamshiRajRjVamshiRajRj
committed
Added the newline and lowercase package name
1 parent 3986292 commit 71fa2e6

File tree

8 files changed

+38
-49
lines changed

8 files changed

+38
-49
lines changed

‎server/src/main/java/edu/sjsu/moth/server/activityPub/ActivityPubUtil.java renamed to ‎server/src/main/java/edu/sjsu/moth/server/activitypub/ActivityPubUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package edu.sjsu.moth.server.activityPub;
1+
package edu.sjsu.moth.server.activitypub;
22

33
import edu.sjsu.moth.server.util.MothConfiguration;
44

‎server/src/main/java/edu/sjsu/moth/server/activityPub/message/AcceptMessage.java renamed to ‎server/src/main/java/edu/sjsu/moth/server/activitypub/message/AcceptMessage.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
package edu.sjsu.moth.server.activityPub.message;
1+
package edu.sjsu.moth.server.activitypub.message;
22

33
import com.fasterxml.jackson.databind.JsonNode;
44

55
public class AcceptMessage extends ActivityPubMessage {
66
//Accept message accepts an Object for the object parameter
77
public JsonNode object;
8+
89
public AcceptMessage(String actor, JsonNode object) {
9-
super("Accept",actor);
10+
super("Accept", actor);
1011
this.object = object;
1112
}
12-
}
13+
}

‎server/src/main/java/edu/sjsu/moth/server/activityPub/message/ActivityPubMessage.java renamed to ‎server/src/main/java/edu/sjsu/moth/server/activitypub/message/ActivityPubMessage.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package edu.sjsu.moth.server.activityPub.message;
1+
package edu.sjsu.moth.server.activitypub.message;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
44
import edu.sjsu.moth.server.util.MothConfiguration;
@@ -19,6 +19,7 @@ public abstract class ActivityPubMessage {
1919
protected ActivityPubMessage(String type, String actor) {
2020
this.type = type;
2121
this.actor = actor;
22-
this.id = String.format("https://%s/%s", MothConfiguration.mothConfiguration.getServerName(), UUID.randomUUID());
22+
this.id =
23+
String.format("https://%s/%s", MothConfiguration.mothConfiguration.getServerName(), UUID.randomUUID());
2324
}
24-
}
25+
}

‎server/src/main/java/edu/sjsu/moth/server/activityPub/message/FollowMessage.java renamed to ‎server/src/main/java/edu/sjsu/moth/server/activitypub/message/FollowMessage.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
package edu.sjsu.moth.server.activityPub.message;
1+
package edu.sjsu.moth.server.activitypub.message;
22

33
public class FollowMessage extends ActivityPubMessage {
44
//Follow message accepts a String for the object parameter
55
public String object;
6+
67
public FollowMessage(String actor, String object) {
7-
super("Follow",actor);
8+
super("Follow", actor);
89
this.object = object;
910
}
10-
}
11+
}

‎server/src/main/java/edu/sjsu/moth/server/activityPub/message/UndoMessage.java renamed to ‎server/src/main/java/edu/sjsu/moth/server/activitypub/message/UndoMessage.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package edu.sjsu.moth.server.activityPub.message;
1+
package edu.sjsu.moth.server.activitypub.message;
22

33
import com.fasterxml.jackson.databind.JsonNode;
44

@@ -10,4 +10,4 @@ public UndoMessage(JsonNode object) {
1010
super("Undo", object.get("actor").asText());
1111
this.object = object;
1212
}
13-
}
13+
}

‎server/src/main/java/edu/sjsu/moth/server/service/AccountService.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,17 @@
44
import com.fasterxml.jackson.databind.ObjectMapper;
55
import edu.sjsu.moth.generated.Relationship;
66
import edu.sjsu.moth.generated.SearchResult;
7-
import edu.sjsu.moth.server.activityPub.ActivityPubUtil;
8-
import edu.sjsu.moth.server.activityPub.message.AcceptMessage;
7+
import edu.sjsu.moth.server.activitypub.ActivityPubUtil;
8+
import edu.sjsu.moth.server.activitypub.message.AcceptMessage;
99
import edu.sjsu.moth.server.controller.InboxController;
1010
import edu.sjsu.moth.server.controller.MothController;
1111
import edu.sjsu.moth.server.db.Account;
1212
import edu.sjsu.moth.server.db.AccountRepository;
13-
import edu.sjsu.moth.server.db.Follow;
1413
import edu.sjsu.moth.server.db.FollowRepository;
1514
import edu.sjsu.moth.server.db.PubKeyPair;
1615
import edu.sjsu.moth.server.db.PubKeyPairRepository;
1716
import edu.sjsu.moth.server.db.WebfingerAlias;
1817
import edu.sjsu.moth.server.db.WebfingerRepository;
19-
import edu.sjsu.moth.server.util.MothConfiguration;
2018
import edu.sjsu.moth.util.WebFingerUtils;
2119
import lombok.extern.apachecommons.CommonsLog;
2220
import org.springframework.beans.factory.annotation.Autowired;

‎server/src/main/java/edu/sjsu/moth/server/service/FollowService.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import com.fasterxml.jackson.databind.JsonNode;
44
import com.fasterxml.jackson.databind.ObjectMapper;
55
import edu.sjsu.moth.generated.Relationship;
6-
import edu.sjsu.moth.server.activityPub.ActivityPubUtil;
7-
import edu.sjsu.moth.server.activityPub.message.FollowMessage;
8-
import edu.sjsu.moth.server.activityPub.message.UndoMessage;
6+
import edu.sjsu.moth.server.activitypub.ActivityPubUtil;
7+
import edu.sjsu.moth.server.activitypub.message.FollowMessage;
8+
import edu.sjsu.moth.server.activitypub.message.UndoMessage;
99
import edu.sjsu.moth.server.db.Account;
1010
import edu.sjsu.moth.server.db.AccountRepository;
1111
import edu.sjsu.moth.server.db.Follow;
@@ -40,8 +40,8 @@ public class FollowService {
4040

4141
public Mono<Relationship> followUser(String followerId, String followedId) {
4242
return Mono.zip(accountRepository.findById(followerId), accountRepository.findById(followedId)).switchIfEmpty(
43-
Mono.error(new ResponseStatusException(HttpStatus.NOT_FOUND, "Follower or Followed account " +
44-
"not found")))
43+
Mono.error(new ResponseStatusException(HttpStatus.NOT_FOUND,
44+
"Follower or Followed account " + "not found")))
4545
.flatMap(tuple -> {
4646
Account followerAccount = tuple.getT1();
4747
Account followedAccount = tuple.getT2();

‎server/src/main/java/edu/sjsu/moth/server/util/Util.java

Lines changed: 16 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.fasterxml.jackson.databind.JsonNode;
44
import com.fasterxml.jackson.databind.ObjectMapper;
5-
import edu.sjsu.moth.server.activityPub.ActivityPubUtil;
5+
import edu.sjsu.moth.server.activitypub.ActivityPubUtil;
66
import edu.sjsu.moth.util.EmailCodeUtils;
77
import edu.sjsu.moth.util.HttpSignature;
88
import org.springframework.http.HttpHeaders;
@@ -118,8 +118,8 @@ public static Mono<Void> signAndSend(JsonNode message, String actorUrl, String i
118118
byte[] bodyBytes = new ObjectMapper().writeValueAsBytes(message);
119119

120120
// Prepare date string in HTTP format
121-
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("EEE, dd MMM yyyy HH:mm:ss 'GMT'")
122-
.withLocale(Locale.US);
121+
DateTimeFormatter formatter =
122+
DateTimeFormatter.ofPattern("EEE, dd MMM yyyy HH:mm:ss 'GMT'").withLocale(Locale.US);
123123
String date = ZonedDateTime.now(ZoneOffset.UTC).format(formatter);
124124
// Set initial headers
125125
HttpHeaders headers = new HttpHeaders();
@@ -128,40 +128,28 @@ public static Mono<Void> signAndSend(JsonNode message, String actorUrl, String i
128128
HttpSignature.addDigest(headers, bodyBytes); // adds SHA-256 digest header
129129

130130
// Headers to be signed
131-
List<String> signedHeaders = List.of(
132-
HttpSignature.REQUEST_TARGET, "host", "date", "digest"
133-
);
131+
List<String> signedHeaders = List.of(HttpSignature.REQUEST_TARGET, "host", "date", "digest");
134132

135133
// Create WebClient builder
136-
WebClient.Builder builder = WebClient.builder()
137-
.defaultHeader(HttpHeaders.ACCEPT, "application/activity+json")
138-
.defaultHeader("Host", targetDomain)
139-
.defaultHeader("Date", date)
140-
.defaultHeader("Digest", headers.getFirst("Digest"));
134+
WebClient.Builder builder =
135+
WebClient.builder().defaultHeader(HttpHeaders.ACCEPT, "application/activity+json")
136+
.defaultHeader("Host", targetDomain).defaultHeader("Date", date)
137+
.defaultHeader("Digest", headers.getFirst("Digest"));
141138

142139
// Attach HTTP Signature filter
143140
HttpSignature.signHeaders(builder, signedHeaders, signingKey, actorUrl + "#main-key");
144141

145142
WebClient client = builder.build();
146143

147144
// Send the signed POST request
148-
return client.post()
149-
.uri(inboxUri)
150-
.contentType(MediaType.APPLICATION_JSON)
151-
.bodyValue(message)
152-
.retrieve()
153-
.onStatus(HttpStatusCode::is4xxClientError, res ->
154-
res.bodyToMono(String.class).flatMap(body -> {
155-
System.err.println("4xx error body: " + body);
156-
return Mono.error(new RuntimeException("Client error: " + body));
157-
}))
158-
.onStatus(HttpStatusCode::is5xxServerError, res ->
159-
res.bodyToMono(String.class).flatMap(body -> {
160-
System.err.println("5xx error body: " + body);
161-
return Mono.error(new RuntimeException("Server error: " + body));
162-
}))
163-
.bodyToMono(String.class)
164-
.doOnNext(response -> System.out.println("Response: " + response))
145+
return client.post().uri(inboxUri).contentType(MediaType.APPLICATION_JSON).bodyValue(message).retrieve()
146+
.onStatus(HttpStatusCode::is4xxClientError, res -> res.bodyToMono(String.class).flatMap(body -> {
147+
System.err.println("4xx error body: " + body);
148+
return Mono.error(new RuntimeException("Client error: " + body));
149+
})).onStatus(HttpStatusCode::is5xxServerError, res -> res.bodyToMono(String.class).flatMap(body -> {
150+
System.err.println("5xx error body: " + body);
151+
return Mono.error(new RuntimeException("Server error: " + body));
152+
})).bodyToMono(String.class).doOnNext(response -> System.out.println("Response: " + response))
165153
.then();
166154

167155
} catch (Exception e) {

0 commit comments

Comments
 (0)