Skip to content

Commit d9f9148

Browse files
tswastlesv
tswast
authored and
lesv
committed
Fix checkstyle errors in XMPP sample. (#184)
Add XMPP sample to Travis build.
1 parent 89e9e51 commit d9f9148

File tree

6 files changed

+106
-87
lines changed

6 files changed

+106
-87
lines changed

‎appengine/xmpp/src/main/java/com/example/appengine/xmpp/ErrorServlet.java

+18-16
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 2016 Google Inc. All Rights Reserved.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,30 +16,32 @@
1616

1717
package com.example.appengine.xmpp;
1818

19+
import com.google.common.io.ByteStreams;
20+
1921
import java.io.ByteArrayOutputStream;
2022
import java.io.IOException;
2123
import java.util.logging.Logger;
24+
2225
import javax.servlet.ServletInputStream;
23-
import javax.servlet.http.*;
24-
import com.google.common.io.ByteStreams;
26+
import javax.servlet.http.HttpServlet;
27+
import javax.servlet.http.HttpServletRequest;
28+
import javax.servlet.http.HttpServletResponse;
2529

2630
// [START example]
2731
@SuppressWarnings("serial")
2832
public class ErrorServlet extends HttpServlet {
33+
private static final Logger log = Logger.getLogger(ErrorServlet.class.getName());
2934

30-
private static final Logger log = Logger.getLogger(ErrorServlet.class.getName());
31-
32-
@Override
33-
public void doPost(HttpServletRequest req, HttpServletResponse res)
34-
throws IOException {
35-
36-
// Parse the POST data, which is sent as a MIME stream containing the stanza.
37-
ByteArrayOutputStream baos = new ByteArrayOutputStream();
38-
ServletInputStream inputStream = req.getInputStream();
39-
ByteStreams.copy(inputStream, baos);
35+
@Override
36+
public void doPost(HttpServletRequest req, HttpServletResponse res)
37+
throws IOException {
38+
// Parse the POST data, which is sent as a MIME stream containing the stanza.
39+
ByteArrayOutputStream baos = new ByteArrayOutputStream();
40+
ServletInputStream inputStream = req.getInputStream();
41+
ByteStreams.copy(inputStream, baos);
4042

41-
// Log the error
42-
log.warning("Error stanza received: " + baos.toString());
43-
}
43+
// Log the error
44+
log.warning("Error stanza received: " + baos.toString());
45+
}
4446
}
4547
// [END example]

‎appengine/xmpp/src/main/java/com/example/appengine/xmpp/MessageReceiverServlet.java

+19-16
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 2016 Google Inc. All Rights Reserved.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,32 +16,35 @@
1616

1717
package com.example.appengine.xmpp;
1818

19-
import java.io.IOException;
20-
import java.util.logging.Logger;
21-
import javax.servlet.http.*;
2219
import com.google.appengine.api.xmpp.JID;
2320
import com.google.appengine.api.xmpp.Message;
2421
import com.google.appengine.api.xmpp.XMPPService;
2522
import com.google.appengine.api.xmpp.XMPPServiceFactory;
2623

24+
import java.io.IOException;
25+
import java.util.logging.Logger;
26+
27+
import javax.servlet.http.HttpServlet;
28+
import javax.servlet.http.HttpServletRequest;
29+
import javax.servlet.http.HttpServletResponse;
30+
2731
// [START example]
2832
@SuppressWarnings("serial")
2933
public class MessageReceiverServlet extends HttpServlet {
34+
private static final Logger log = Logger.getLogger(MessageReceiverServlet.class.getName());
3035

31-
private static final Logger log = Logger.getLogger(MessageReceiverServlet.class.getName());
32-
33-
@Override
34-
public void doPost(HttpServletRequest req, HttpServletResponse res)
35-
throws IOException {
36+
@Override
37+
public void doPost(HttpServletRequest req, HttpServletResponse res)
38+
throws IOException {
3639

37-
XMPPService xmpp = XMPPServiceFactory.getXMPPService();
38-
Message message = xmpp.parseMessage(req);
40+
XMPPService xmpp = XMPPServiceFactory.getXMPPService();
41+
Message message = xmpp.parseMessage(req);
3942

40-
JID fromJid = message.getFromJid();
41-
String body = message.getBody();
43+
JID fromJid = message.getFromJid();
44+
String body = message.getBody();
4245

43-
log.info("Received a message with id: " + fromJid + " and body: " + body);
44-
// ...
45-
}
46+
log.info("Received a message with id: " + fromJid + " and body: " + body);
47+
// ...
48+
}
4649
}
4750
// [END example]

‎appengine/xmpp/src/main/java/com/example/appengine/xmpp/MessageSenderServlet.java

+24-20
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 2016 Google Inc. All Rights Reserved.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,43 +16,47 @@
1616

1717
package com.example.appengine.xmpp;
1818

19-
import java.io.IOException;
20-
import java.util.logging.Logger;
21-
import javax.servlet.http.*;
2219
import com.google.appengine.api.xmpp.JID;
2320
import com.google.appengine.api.xmpp.Message;
2421
import com.google.appengine.api.xmpp.MessageBuilder;
2522
import com.google.appengine.api.xmpp.SendResponse;
2623
import com.google.appengine.api.xmpp.XMPPService;
2724
import com.google.appengine.api.xmpp.XMPPServiceFactory;
2825

26+
import java.io.IOException;
27+
import java.util.logging.Logger;
28+
29+
import javax.servlet.http.HttpServlet;
30+
import javax.servlet.http.HttpServletRequest;
31+
import javax.servlet.http.HttpServletResponse;
32+
2933
// [START example]
3034
@SuppressWarnings("serial")
3135
public class MessageSenderServlet extends HttpServlet {
36+
private static final Logger log = Logger.getLogger(MessageSenderServlet.class.getName());
3237

33-
private static final Logger log = Logger.getLogger(MessageSenderServlet.class.getName());
34-
35-
@Override
36-
public void doGet(HttpServletRequest req, HttpServletResponse res)
37-
throws IOException {
38+
@Override
39+
public void doGet(HttpServletRequest req, HttpServletResponse res)
40+
throws IOException {
3841

39-
JID jid = new JID("[email protected]");
40-
String msgBody = "Someone has sent you a gift on Example.com. To view: http://example.com/gifts/";
41-
Message msg = new MessageBuilder()
42+
JID jid = new JID("[email protected]");
43+
String msgBody = "Someone has sent you a gift on Example.com. To view: http://example.com/gifts/";
44+
Message msg =
45+
new MessageBuilder()
4246
.withRecipientJids(jid)
4347
.withBody(msgBody)
4448
.build();
4549

46-
boolean messageSent = false;
47-
XMPPService xmpp = XMPPServiceFactory.getXMPPService();
48-
SendResponse status = xmpp.sendMessage(msg);
49-
messageSent = (status.getStatusMap().get(jid) == SendResponse.Status.SUCCESS);
50+
boolean messageSent = false;
51+
XMPPService xmpp = XMPPServiceFactory.getXMPPService();
52+
SendResponse status = xmpp.sendMessage(msg);
53+
messageSent = (status.getStatusMap().get(jid) == SendResponse.Status.SUCCESS);
5054

51-
log.info("Message sent? " + messageSent);
55+
log.info("Message sent? " + messageSent);
5256

53-
if (!messageSent) {
54-
// Send an email message instead...
55-
}
57+
if (!messageSent) {
58+
// Send an email message instead...
5659
}
60+
}
5761
}
5862
// [END example]

‎appengine/xmpp/src/main/java/com/example/appengine/xmpp/PresenceServlet.java

+25-18
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 2016 Google Inc. All Rights Reserved.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,35 +16,42 @@
1616

1717
package com.example.appengine.xmpp;
1818

19-
import java.io.IOException;
20-
import java.util.logging.Logger;
21-
import javax.servlet.http.*;
2219
import com.google.appengine.api.xmpp.Presence;
2320
import com.google.appengine.api.xmpp.PresenceType;
2421
import com.google.appengine.api.xmpp.XMPPService;
2522
import com.google.appengine.api.xmpp.XMPPServiceFactory;
2623

24+
import java.io.IOException;
25+
import java.util.logging.Logger;
26+
27+
import javax.servlet.http.HttpServlet;
28+
import javax.servlet.http.HttpServletRequest;
29+
import javax.servlet.http.HttpServletResponse;
30+
2731
// [START example]
2832
@SuppressWarnings("serial")
2933
public class PresenceServlet extends HttpServlet {
34+
private static final Logger log = Logger.getLogger(PresenceServlet.class.getName());
3035

31-
private static final Logger log = Logger.getLogger(PresenceServlet.class.getName());
32-
33-
@Override
34-
public void doPost(HttpServletRequest req, HttpServletResponse res)
35-
throws IOException {
36+
@Override
37+
public void doPost(HttpServletRequest req, HttpServletResponse res)
38+
throws IOException {
3639

37-
XMPPService xmpp = XMPPServiceFactory.getXMPPService();
38-
Presence presence = xmpp.parsePresence(req);
40+
XMPPService xmpp = XMPPServiceFactory.getXMPPService();
41+
Presence presence = xmpp.parsePresence(req);
3942

40-
// Split the XMPP address (e.g., [email protected])
41-
// from the resource (e.g., gmail.CD6EBC4A)
42-
String from = presence.getFromJid().getId().split("/")[0];
43+
// Split the XMPP address (e.g., [email protected])
44+
// from the resource (e.g., gmail.CD6EBC4A)
45+
String from = presence.getFromJid().getId().split("/")[0];
4346

44-
log.info("Received presence from: " + from);
47+
log.info("Received presence from: " + from);
4548

46-
// Mirror the contact's presence back to them
47-
xmpp.sendPresence(presence.getFromJid(), PresenceType.AVAILABLE, presence.getPresenceShow(), presence.getStatus());
48-
}
49+
// Mirror the contact's presence back to them
50+
xmpp.sendPresence(
51+
presence.getFromJid(),
52+
PresenceType.AVAILABLE,
53+
presence.getPresenceShow(),
54+
presence.getStatus());
55+
}
4956
}
5057
// [END example]

‎appengine/xmpp/src/main/java/com/example/appengine/xmpp/SubscriptionServlet.java

+19-17
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 2016 Google Inc. All Rights Reserved.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,31 +16,33 @@
1616

1717
package com.example.appengine.xmpp;
1818

19-
import java.io.IOException;
20-
import java.util.logging.Logger;
21-
import javax.servlet.http.*;
2219
import com.google.appengine.api.xmpp.Subscription;
2320
import com.google.appengine.api.xmpp.XMPPService;
2421
import com.google.appengine.api.xmpp.XMPPServiceFactory;
2522

23+
import java.io.IOException;
24+
import java.util.logging.Logger;
25+
26+
import javax.servlet.http.HttpServlet;
27+
import javax.servlet.http.HttpServletRequest;
28+
import javax.servlet.http.HttpServletResponse;
29+
2630
// [START example]
2731
@SuppressWarnings("serial")
2832
public class SubscriptionServlet extends HttpServlet {
33+
private static final Logger log = Logger.getLogger(SubscriptionServlet.class.getName());
2934

30-
private static final Logger log = Logger.getLogger(SubscriptionServlet.class.getName());
31-
32-
@Override
33-
public void doPost(HttpServletRequest req, HttpServletResponse res)
34-
throws IOException {
35-
36-
XMPPService xmppService = XMPPServiceFactory.getXMPPService();
37-
Subscription sub = xmppService.parseSubscription(req);
35+
@Override
36+
public void doPost(HttpServletRequest req, HttpServletResponse res)
37+
throws IOException {
38+
XMPPService xmppService = XMPPServiceFactory.getXMPPService();
39+
Subscription sub = xmppService.parseSubscription(req);
3840

39-
// Split the bare XMPP address (e.g., [email protected])
40-
// from the resource (e.g., gmail.CD6EBC4A)
41-
String from = sub.getFromJid().getId().split("/")[0];
41+
// Split the bare XMPP address (e.g., [email protected])
42+
// from the resource (e.g., gmail.CD6EBC4A)
43+
String from = sub.getFromJid().getId().split("/")[0];
4244

43-
log.info("Received subscription event from: " + from);
44-
}
45+
log.info("Received subscription event from: " + from);
46+
}
4547
}
4648
// [END example]

‎pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
<module>appengine/twilio</module>
6363
<module>appengine/urlfetch</module>
6464
<module>appengine/users</module>
65+
<module>appengine/xmpp</module>
6566
<module>bigquery</module>
6667
<module>compute/cmdline</module>
6768
<module>datastore</module>

0 commit comments

Comments
 (0)