Skip to content

Riina Antikainen / Moya

Go to a project
Commit 28bfd68e by Tuomas Riihimäki
Options

Rest to jackson.

1 parent c9b01cc0
Inline Side-by-side
Showing with 128 additions and 113 deletions
code/MoyaWeb/.settings/org.eclipse.ltk.core.refactoring.prefs 0 → 100644
eclipse.preferences.version=1
org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
code/MoyaWeb/WebContent/WEB-INF/web.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:web="http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0">
xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
id="WebApp_ID" version="3.0">
<display-name>LanBortalWeb</display-name> <display-name>LanBortalWeb</display-name>
<session-config>
<session-timeout>120</session-timeout>
</session-config>
<context-param>
<param-name>javax.faces.PROJECT_STAGE</param-name>
<!-- Production | Development -->
<param-value>Development</param-value>
</context-param>
<context-param> <context-param>
<param-name>javax.faces.FACELETS_SKIP_COMMENTS</param-name> <param-name>javax.faces.FACELETS_SKIP_COMMENTS</param-name>
<param-value>true</param-value> <param-value>true</param-value>
</context-param> </context-param>
<servlet-mapping> <context-param>
<servlet-name>PlaceMap</servlet-name> <param-name>javax.faces.PROJECT_STAGE</param-name>
<url-pattern>/PlaceMap</url-pattern> <param-value>Development</param-value>
</servlet-mapping> </context-param>
<welcome-file-list> <filter>
<welcome-file>index.html</welcome-file> <display-name>PrimefacesFileupload</display-name>
<welcome-file>index.jsf</welcome-file> <filter-name>PrimeFacesFileupload</filter-name>
<welcome-file>index.jsp</welcome-file> <filter-class>org.primefaces.webapp.filter.FileUploadFilter</filter-class>
<welcome-file>index.wtf</welcome-file> </filter>
</welcome-file-list> <filter>
<error-page> <display-name>HostnameFilter</display-name>
<exception-type>java.lang.Exception</exception-type> <filter-name>HostnameFilter</filter-name>
<location>/error.jsf</location> <filter-class>fi.codecrew.moya.HostnameFilter</filter-class>
</error-page> </filter>
<filter-mapping>
<filter-name>PrimeFacesFileupload</filter-name>
<servlet-name>Faces Servlet</servlet-name>
</filter-mapping>
<filter-mapping>
<filter-name>HostnameFilter</filter-name>
<servlet-name>*</servlet-name>
</filter-mapping>
<servlet> <servlet>
<servlet-name>Faces Servlet</servlet-name> <servlet-name>Faces Servlet</servlet-name>
<servlet-class>javax.faces.webapp.FacesServlet</servlet-class> <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
...@@ -39,71 +36,91 @@ ...@@ -39,71 +36,91 @@
<servlet-name>UploadServlet</servlet-name> <servlet-name>UploadServlet</servlet-name>
<servlet-class>fi.codecrew.moya.servlet.UploadServlet</servlet-class> <servlet-class>fi.codecrew.moya.servlet.UploadServlet</servlet-class>
</servlet> </servlet>
<servlet-mapping>
<servlet-name>UploadServlet</servlet-name>
<url-pattern>/UploadServlet</url-pattern>
</servlet-mapping>
<servlet> <servlet>
<servlet-name>UserImageServlet</servlet-name> <servlet-name>UserImageServlet</servlet-name>
<servlet-class>fi.codecrew.moya.servlet.UserImageServlet</servlet-class> <servlet-class>fi.codecrew.moya.servlet.UserImageServlet</servlet-class>
</servlet> </servlet>
<servlet-mapping>
<servlet-name>UserImageServlet</servlet-name>
<url-pattern>/Userimage</url-pattern>
</servlet-mapping>
<servlet> <servlet>
<servlet-name>UserCardServlet</servlet-name> <servlet-name>UserCardServlet</servlet-name>
<servlet-class>fi.codecrew.moya.servlet.UserCardServlet</servlet-class> <servlet-class>fi.codecrew.moya.servlet.UserCardServlet</servlet-class>
</servlet> </servlet>
<servlet-mapping>
<servlet-name>UserCardServlet</servlet-name>
<url-pattern>/UserCard</url-pattern>
</servlet-mapping>
<servlet> <servlet>
<servlet-name>CardTemplateServlet</servlet-name> <servlet-name>CardTemplateServlet</servlet-name>
<servlet-class>fi.codecrew.moya.servlet.CardTemplateServlet</servlet-class> <servlet-class>fi.codecrew.moya.servlet.CardTemplateServlet</servlet-class>
</servlet> </servlet>
<servlet-mapping>
<servlet-name>CardTemplateServlet</servlet-name>
<url-pattern>/CardTemplate</url-pattern>
</servlet-mapping>
<servlet> <servlet>
<servlet-name>PlaceMap</servlet-name> <servlet-name>PlaceMap</servlet-name>
<servlet-class>fi.codecrew.moya.servlet.PlaceMap</servlet-class> <servlet-class>fi.codecrew.moya.servlet.PlaceMap</servlet-class>
</servlet> </servlet>
<servlet>
<display-name>PrintBill</display-name>
<servlet-name>PrintBill</servlet-name>
<servlet-class>fi.codecrew.moya.servlet.PrintBill</servlet-class>
</servlet>
<servlet>
<display-name>PlaceGroupPdf</display-name>
<servlet-name>PlaceGroupPdf</servlet-name>
<servlet-class>fi.codecrew.moya.servlet.PlaceGroupPdf</servlet-class>
</servlet>
<servlet>
<description>JAX-RS Tools Generated - Do not modify</description>
<servlet-name>JAX-RS Servlet</servlet-name>
<servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
<init-param>
<param-name>com.sun.jersey.config.property.packages</param-name>
<param-value>fi.codecrew.moya.rest;org.codehaus.jackson.jaxrs</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
<servlet-name>PlaceMap</servlet-name>
<url-pattern>/PlaceMap</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>UploadServlet</servlet-name>
<url-pattern>/UploadServlet</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>UserImageServlet</servlet-name>
<url-pattern>/Userimage</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>UserCardServlet</servlet-name>
<url-pattern>/UserCard</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>CardTemplateServlet</servlet-name>
<url-pattern>/CardTemplate</url-pattern>
</servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>Faces Servlet</servlet-name> <servlet-name>Faces Servlet</servlet-name>
<url-pattern>*.jsf</url-pattern> <url-pattern>*.jsf</url-pattern>
<url-pattern>*.wtf</url-pattern>
<url-pattern>/faces/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<filter> <servlet-mapping>
<display-name>PrimefacesFileupload</display-name> <servlet-name>PrintBill</servlet-name>
<filter-name>PrimeFacesFileupload</filter-name> <url-pattern>/PrintBill</url-pattern>
<filter-class>org.primefaces.webapp.filter.FileUploadFilter</filter-class> </servlet-mapping>
</filter> <servlet-mapping>
<filter-mapping> <servlet-name>PlaceGroupPdf</servlet-name>
<filter-name>PrimeFacesFileupload</filter-name> <url-pattern>/PlaceGroupPdf</url-pattern>
<servlet-name>Faces Servlet</servlet-name> </servlet-mapping>
</filter-mapping> <servlet-mapping>
<filter> <servlet-name>JAX-RS Servlet</servlet-name>
<display-name>HostnameFilter</display-name> <url-pattern>/rest/*</url-pattern>
<filter-name>HostnameFilter</filter-name> </servlet-mapping>
<filter-class>fi.codecrew.moya.HostnameFilter</filter-class> <session-config>
</filter> <session-timeout>120</session-timeout>
<filter-mapping> </session-config>
<filter-name>HostnameFilter</filter-name> <welcome-file-list>
<servlet-name>*</servlet-name> <welcome-file>index.html</welcome-file>
</filter-mapping> <welcome-file>index.jsf</welcome-file>
<login-config> <welcome-file>index.jsp</welcome-file>
<auth-method>FORM</auth-method> <welcome-file>index.wtf</welcome-file>
<realm-name>moyaRealm</realm-name> </welcome-file-list>
<form-login-config> <error-page>
<form-login-page>/auth/login.jsf</form-login-page> <exception-type>java.lang.Exception</exception-type>
<form-error-page>/auth/loginError.jsf</form-error-page> <location>/error.jsf</location>
</form-login-config> </error-page>
</login-config>
<security-constraint> <security-constraint>
<display-name>Forbidden resource</display-name> <display-name>Forbidden resource</display-name>
<web-resource-collection> <web-resource-collection>
...@@ -119,38 +136,15 @@ ...@@ -119,38 +136,15 @@
<transport-guarantee>CONFIDENTIAL</transport-guarantee> <transport-guarantee>CONFIDENTIAL</transport-guarantee>
</user-data-constraint> </user-data-constraint>
</security-constraint> </security-constraint>
<servlet> <login-config>
<description></description> <auth-method>FORM</auth-method>
<display-name>PrintBill</display-name> <realm-name>moyaRealm</realm-name>
<servlet-name>PrintBill</servlet-name> <form-login-config>
<servlet-class>fi.codecrew.moya.servlet.PrintBill</servlet-class> <form-login-page>/auth/login.jsf</form-login-page>
</servlet> <form-error-page>/auth/loginError.jsf</form-error-page>
<servlet-mapping> </form-login-config>
<servlet-name>PrintBill</servlet-name> </login-config>
<url-pattern>/PrintBill</url-pattern>
</servlet-mapping>
<persistence-unit-ref> <persistence-unit-ref>
<persistence-unit-ref-name>BortalEMF</persistence-unit-ref-name> <persistence-unit-ref-name>BortalEMF</persistence-unit-ref-name>
</persistence-unit-ref> </persistence-unit-ref>
<servlet>
<description></description>
<display-name>PlaceGroupPdf</display-name>
<servlet-name>PlaceGroupPdf</servlet-name>
<servlet-class>fi.codecrew.moya.servlet.PlaceGroupPdf</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>PlaceGroupPdf</servlet-name>
<url-pattern>/PlaceGroupPdf</url-pattern>
</servlet-mapping>
<servlet>
<description>JAX-RS Tools Generated - Do not modify</description>
<servlet-name>JAX-RS Servlet</servlet-name>
<servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
<servlet-name>JAX-RS Servlet</servlet-name>
<url-pattern>/rest/*</url-pattern>
</servlet-mapping>
</web-app> </web-app>
\ No newline at end of file
code/MoyaWeb/src/fi/codecrew/moya/rest/PrinterRestView.java
package fi.codecrew.moya.rest; package fi.codecrew.moya.rest;
import java.util.List;
import javax.ejb.EJB; import javax.ejb.EJB;
import javax.enterprise.context.RequestScoped; import javax.enterprise.context.RequestScoped;
import javax.ws.rs.Consumes; import javax.ws.rs.Consumes;
...@@ -22,6 +20,7 @@ import fi.codecrew.moya.beans.CardTemplateBeanLocal; ...@@ -22,6 +20,7 @@ import fi.codecrew.moya.beans.CardTemplateBeanLocal;
import fi.codecrew.moya.beans.UserBeanLocal; import fi.codecrew.moya.beans.UserBeanLocal;
import fi.codecrew.moya.enums.CardState; import fi.codecrew.moya.enums.CardState;
import fi.codecrew.moya.model.PrintedCard; import fi.codecrew.moya.model.PrintedCard;
import fi.codecrew.moya.rest.pojo.CardRoot;
import fi.codecrew.moya.rest.pojo.PrintedCardRestPojo; import fi.codecrew.moya.rest.pojo.PrintedCardRestPojo;
@RequestScoped @RequestScoped
...@@ -98,16 +97,16 @@ public class PrinterRestView { ...@@ -98,16 +97,16 @@ public class PrinterRestView {
@GET @GET
@Path("/ListUnprinted") @Path("/ListUnprinted")
public List<PrintedCardRestPojo> getUserCard(@QueryParam("key") String key) throws Exception { public CardRoot getUserCard(@QueryParam("key") String key) throws Exception {
List<PrintedCardRestPojo> ret = PrintedCardRestPojo.parseCards(cardbean.getCardsByState(CardState.VALIDATED)); CardRoot ret = PrintedCardRestPojo.parseCards(cardbean.getCardsByState(CardState.VALIDATED));
logger.info("Returning card pojos: {} for key {}", ret, key); logger.info("Returning card pojos: {} for key {}", ret, key);
return ret; return ret;
} }
@GET @GET
@Path("/ListAll") @Path("/ListAll")
public List<PrintedCardRestPojo> getAllCards(@QueryParam("key") String key) throws Exception { public CardRoot getAllCards(@QueryParam("key") String key) throws Exception {
List<PrintedCardRestPojo> ret = PrintedCardRestPojo.parseCards(cardbean.getCardsByState()); CardRoot ret = PrintedCardRestPojo.parseCards(cardbean.getCardsByState());
logger.info("Returning card pojos: {} for key {}", ret, key); logger.info("Returning card pojos: {} for key {}", ret, key);
return ret; return ret;
} }
......
code/MoyaWeb/src/fi/codecrew/moya/rest/pojo/CardRoot.java 0 → 100644
package fi.codecrew.moya.rest.pojo;
import java.util.List;
import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement
public class CardRoot {
@XmlElementWrapper(name = "cards")
private List<PrintedCardRestPojo> cards;
public List<PrintedCardRestPojo> getCards() {
return cards;
}
public void setCards(List<PrintedCardRestPojo> cards) {
this.cards = cards;
}
}
code/MoyaWeb/src/fi/codecrew/moya/rest/pojo/PrintedCardRestPojo.java
...@@ -4,12 +4,10 @@ import java.util.ArrayList; ...@@ -4,12 +4,10 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient; import javax.xml.bind.annotation.XmlTransient;
import fi.codecrew.moya.model.PrintedCard; import fi.codecrew.moya.model.PrintedCard;
@XmlRootElement(name = "cards")
public class PrintedCardRestPojo { public class PrintedCardRestPojo {
public PrintedCardRestPojo() { public PrintedCardRestPojo() {
...@@ -57,12 +55,14 @@ public class PrintedCardRestPojo { ...@@ -57,12 +55,14 @@ public class PrintedCardRestPojo {
return card.getCardState().toString(); return card.getCardState().toString();
} }
public static List<PrintedCardRestPojo> parseCards(List<PrintedCard> cards) public static CardRoot parseCards(List<PrintedCard> cards)
{ {
ArrayList<PrintedCardRestPojo> ret = new ArrayList<PrintedCardRestPojo>(); ArrayList<PrintedCardRestPojo> ret = new ArrayList<PrintedCardRestPojo>();
for (PrintedCard c : cards) { for (PrintedCard c : cards) {
ret.add(new PrintedCardRestPojo(c)); ret.add(new PrintedCardRestPojo(c));
} }
return ret; CardRoot root = new CardRoot();
root.setCards(ret);
return root;
} }
} }
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!