Skip to content

Commit 946733b

Browse files
author
Reza Rahman
committed
Minor cleanup.
1 parent 6c978c6 commit 946733b

10 files changed

Lines changed: 68 additions & 17 deletions

File tree

‎actionbazaar/pom.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@
8383
<version>1.0.0.CR4</version>
8484
<scope>test</scope>
8585
</dependency>
86+
<!-- WebSocket client dependencies -->
87+
<!--
8688
<dependency>
8789
<groupId>org.glassfish.tyrus</groupId>
8890
<artifactId>tyrus-server</artifactId>
@@ -95,6 +97,15 @@
9597
<version>1.7</version>
9698
<scope>test</scope>
9799
</dependency>
100+
-->
101+
<!-- Jersey client dependencies -->
102+
<!--
103+
<dependency>
104+
<groupId>org.glassfish.jersey.core</groupId>
105+
<artifactId>jersey-client</artifactId>
106+
<version>2.16</version>
107+
</dependency>
108+
-->
98109
</dependencies>
99110
<build>
100111
<finalName>actionbazaar</finalName>

‎actionbazaar/src/main/java/com/actionbazaar/application/DefaultBidService.java‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,36 +39,48 @@
3939
*/
4040
package com.actionbazaar.application;
4141

42-
import javax.ejb.Stateless;
43-
import javax.inject.Inject;
44-
4542
import com.actionbazaar.domain.Bid;
4643
import com.actionbazaar.domain.BidRepository;
44+
import java.util.logging.Level;
45+
import java.util.logging.Logger;
46+
import javax.ejb.Stateless;
47+
import javax.inject.Inject;
4748

4849
@Stateless
4950
@Profiled
5051
public class DefaultBidService implements BidService {
5152

53+
private static final Logger logger = Logger
54+
.getLogger(DefaultBidService.class.getName());
55+
5256
@Inject
5357
private BidRepository bidRepository;
5458

5559
@Override
5660
public Bid addBid(Bid bid) {
61+
logger.log(Level.INFO, "Adding bid: {0}", bid);
62+
5763
return bidRepository.addBid(bid);
5864
}
5965

6066
@Override
6167
public Bid getBid(Long id) {
68+
logger.log(Level.INFO, "Getting bid: {0}", id);
69+
6270
return bidRepository.getBid(id);
6371
}
6472

6573
@Override
6674
public void updateBid(Bid bid) {
75+
logger.log(Level.INFO, "Updating bid: {0}", bid);
76+
6777
bidRepository.updateBid(bid);
6878
}
6979

7080
@Override
7181
public void deleteBid(Bid bid) {
82+
logger.log(Level.INFO, "Deleting bid: {0}", bid);
83+
7284
bidRepository.deleteBid(bid);
7385
}
7486
}

‎actionbazaar/src/main/java/com/actionbazaar/interfaces/socket/ChatMessage.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
package com.actionbazaar.interfaces.socket;
4141

4242
import java.io.StringReader;
43+
import java.util.logging.Level;
44+
import java.util.logging.Logger;
4345
import javax.json.Json;
4446
import javax.json.JsonObject;
4547
import javax.json.JsonReader;
@@ -50,6 +52,9 @@
5052
public class ChatMessage
5153
implements Decoder.Text<ChatMessage>, Encoder.Text<ChatMessage> {
5254

55+
private static final Logger logger = Logger
56+
.getLogger(ChatMessage.class.getName());
57+
5358
private String user;
5459
private String message;
5560

@@ -77,6 +82,8 @@ public void init(EndpointConfig config) {
7782

7883
@Override
7984
public ChatMessage decode(String value) {
85+
logger.log(Level.FINE, "Decoding JSON: {0}", value);
86+
8087
try (JsonReader jsonReader = Json.createReader(
8188
new StringReader(value))) {
8289
JsonObject jsonObject = jsonReader.readObject();
@@ -94,6 +101,8 @@ public boolean willDecode(String string) {
94101

95102
@Override
96103
public String encode(ChatMessage chatMessage) {
104+
logger.log(Level.FINE, "Encoding to JSON: {0}", chatMessage);
105+
97106
JsonObject jsonObject = Json.createObjectBuilder()
98107
.add("user", chatMessage.user)
99108
.add("message", chatMessage.message)

‎actionbazaar/src/main/java/com/actionbazaar/interfaces/web/AlertServlet.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@
4141

4242
import java.io.IOException;
4343
import java.io.PrintWriter;
44-
44+
import java.util.logging.Level;
45+
import java.util.logging.Logger;
4546
import javax.json.Json;
4647
import javax.json.stream.JsonGenerator;
4748
import javax.servlet.ServletException;
@@ -54,17 +55,20 @@
5455
public class AlertServlet extends HttpServlet {
5556

5657
private static final long serialVersionUID = 1L;
58+
private static final Logger logger = Logger
59+
.getLogger(AlertServlet.class.getName());
5760

5861
@Override
5962
public void service(ServletRequest request, ServletResponse response)
6063
throws IOException, ServletException {
61-
6264
response.setContentType("application/json");
6365

6466
PrintWriter out = response.getWriter();
6567

6668
long userId = Long.parseLong(request.getParameter("user_id"));
6769

70+
logger.log(Level.INFO, "Generating alerts for: {0}", userId);
71+
6872
try (JsonGenerator generator = Json.createGenerator(out)) {
6973
generator.writeStartObject();
7074

‎actionbazaar/src/main/webapp/WEB-INF/web.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@
2525
<data-source>
2626
<name>java:global/jdbc/ActionBazaarDB</name>
2727
<class-name>org.apache.derby.jdbc.EmbeddedDriver</class-name>
28-
<url>jdbc:derby:/tmp/actionbazaar-database;create=true</url>
28+
<url>jdbc:derby:/tmp/actionbazaar-development-database;create=true</url>
2929
</data-source>
3030
</web-app>

‎actionbazaar/src/test/java/com/actionbazaar/infrastructure/database/MockBidRepository.java‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,27 @@
3939
*/
4040
package com.actionbazaar.infrastructure.database;
4141

42-
import com.actionbazaar.domain.BidRepository;
4342
import com.actionbazaar.domain.Bid;
43+
import com.actionbazaar.domain.BidRepository;
44+
import java.util.logging.Level;
45+
import java.util.logging.Logger;
4446

4547
public class MockBidRepository implements BidRepository {
4648

49+
private static final Logger logger = Logger
50+
.getLogger(MockBidRepository.class.getName());
51+
4752
@Override
4853
public Bid addBid(Bid bid) {
54+
logger.log(Level.INFO, "Mock add bid.");
55+
4956
return bid;
5057
}
5158

5259
@Override
5360
public Bid getBid(Long id) {
61+
logger.log(Level.INFO, "Mock get bid.");
62+
5463
Bid bid = new Bid();
5564
bid.setId(id);
5665
bid.setBidder("nrahman");
@@ -62,11 +71,11 @@ public Bid getBid(Long id) {
6271

6372
@Override
6473
public void updateBid(Bid bid) {
65-
// NOOP
74+
logger.log(Level.INFO, "Mock update bid.");
6675
}
6776

6877
@Override
6978
public void deleteBid(Bid bid) {
70-
// NOOP
79+
logger.log(Level.INFO, "Mock delete bid.");
7180
}
7281
}

‎actionbazaar/src/test/java/com/actionbazaar/interfaces/rest/BidRestServiceTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,9 @@
5757
import org.junit.Test;
5858
import org.junit.runner.RunWith;
5959

60+
// Ran into weird bugs trying to run this on the client.
61+
// Probably another Maven dependency melee.
6062
@RunWith(Arquillian.class)
61-
// TODO Move this to client side.
6263
public class BidRestServiceTest {
6364

6465
private static Long bidId;

‎actionbazaar/src/test/java/com/actionbazaar/interfaces/socket/ChatServerTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,9 @@
6464
import org.junit.Test;
6565
import org.junit.runner.RunWith;
6666

67+
// Ran into weird bugs trying to run this on the client.
68+
// Probably another Maven dependency melee.
6769
@RunWith(Arquillian.class)
68-
// TODO Move test to client side.
6970
public class ChatServerTest {
7071

7172
private static final Logger logger

‎actionbazaar/src/test/java/com/actionbazaar/interfaces/web/AlertServletTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,9 @@
5050
import org.junit.Test;
5151
import org.junit.runner.RunWith;
5252

53+
// Ran into weird bugs trying to run this on the client.
54+
// Probably another Maven dependency melee.
5355
@RunWith(Arquillian.class)
54-
// TODO Move to client side.
5556
public class AlertServletTest {
5657

5758
@Deployment

‎actionbazaar/src/test/resources/arquillian.xml‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
11
<?xml version="1.0"?>
22
<arquillian xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xmlns="http://jboss.org/schema/arquillian"
4-
xsi:schemaLocation="http://jboss.org/schema/arquillian
4+
xsi:schemaLocation="http://jboss.org/schema/arquillian
55
http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
6-
<engine>
7-
<property name="deploymentExportPath">target/</property>
6+
<engine>
7+
<property name="deploymentExportPath">target/</property>
88
</engine>
9+
<extension qualifier="webdriver">
10+
<property name="browser">firefox</property>
11+
</extension>
912
<container qualifier="glassfish" default="true">
1013
<configuration>
1114
<property name="glassFishHome">C:\glassfish4.1</property>
1215
<property name="adminHost">localhost</property>
1316
<property name="adminPort">4848</property>
1417
<property name="adminUser">admin</property>
15-
<property name="adminPassword">admin</property>
18+
<property name="adminPassword">admin</property>
1619
</configuration>
17-
</container>
20+
</container>
1821
</arquillian>

0 commit comments

Comments
 (0)