Skip to content

Commit c1f028f

Browse files
author
veosaf
committed
fix footer and some issues
1 parent f23a21e commit c1f028f

30 files changed

+430
-166
lines changed

pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@
3131
<artifactId>spring-boot-starter-tomcat</artifactId>
3232
<scope>provided</scope>
3333
</dependency>
34+
<dependency>
35+
<groupId>com.fasterxml.jackson.datatype</groupId>
36+
<artifactId>jackson-datatype-jsr310</artifactId>
37+
</dependency>
3438
<dependency>
3539
<groupId>org.springframework.boot</groupId>
3640
<artifactId>spring-boot-starter-web</artifactId>
@@ -88,10 +92,6 @@
8892
<groupId>com.h2database</groupId>
8993
<artifactId>h2</artifactId>
9094
</dependency>
91-
<dependency>
92-
<groupId>joda-time</groupId>
93-
<artifactId>joda-time</artifactId>
94-
</dependency>
9595
<dependency>
9696
<groupId>mysql</groupId>
9797
<artifactId>mysql-connector-java</artifactId>
@@ -104,7 +104,7 @@
104104
</dependencies>
105105

106106
<build>
107-
<finalName>${project.artifactId}</finalName>
107+
<finalName>bookrental</finalName>
108108
<plugins>
109109
<plugin>
110110
<groupId>org.apache.maven.plugins</groupId>
@@ -148,7 +148,7 @@
148148
<dependency>
149149
<groupId>org.springframework</groupId>
150150
<artifactId>springloaded</artifactId>
151-
<version>1.2.6.RELEASE</version>
151+
<version>1.2.6.RELEASE</version>
152152
</dependency>
153153
</dependencies>
154154
<executions>

src/main/java/com/veosaf/bookRental/DataLoader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public void onApplicationEvent(ContextRefreshedEvent arg0) {
4141

4242
private void addBooks() {
4343
Book book = new Book();
44-
book.setTitle("Java Book");
44+
book.setTitle(null);
4545
book.setPublicationDate(new GregorianCalendar(2017, 0, 31).getTime());
4646
book.setAuthor("Simon");
4747
bookRepository.save(book);

src/main/java/com/veosaf/bookRental/RepositoryConfiguration.java renamed to src/main/java/com/veosaf/bookRental/config/RepositoryConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.veosaf.bookRental;
1+
package com.veosaf.bookRental.config;
22

33
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
44
import org.springframework.context.annotation.ComponentScan;
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
package com.veosaf.bookRental.config;
2+
3+
import java.text.SimpleDateFormat;
4+
5+
import org.springframework.context.annotation.Bean;
6+
import org.springframework.context.annotation.Configuration;
7+
import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
8+
9+
import com.fasterxml.jackson.annotation.JsonInclude;
10+
import com.fasterxml.jackson.databind.SerializationFeature;
11+
12+
@Configuration
13+
public class RestConfig {
14+
15+
@Bean
16+
public Jackson2ObjectMapperBuilder objectMapperBuilder() {
17+
Jackson2ObjectMapperBuilder builder = new Jackson2ObjectMapperBuilder();
18+
builder.serializationInclusion(JsonInclude.Include.NON_NULL);
19+
builder.dateFormat(new SimpleDateFormat("dd/MM/yyyy"));
20+
builder.featuresToDisable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
21+
return builder;
22+
}
23+
}

src/main/java/com/veosaf/bookRental/StaticResourceConfiguration.java renamed to src/main/java/com/veosaf/bookRental/config/StaticResourceConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.veosaf.bookRental;
1+
package com.veosaf.bookRental.config;
22

33
import org.springframework.context.annotation.Configuration;
44
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;

src/main/java/com/veosaf/bookRental/WebConfiguration.java renamed to src/main/java/com/veosaf/bookRental/config/WebConfiguration.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
1-
package com.veosaf.bookRental;
1+
package com.veosaf.bookRental.config;
22

33
import org.h2.server.web.WebServlet;
44
import org.springframework.boot.web.servlet.ServletRegistrationBean;
55
import org.springframework.context.annotation.Bean;
66
import org.springframework.context.annotation.Configuration;
7+
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
78

89
@Configuration
9-
public class WebConfiguration {
10+
public class WebConfiguration extends WebMvcConfigurerAdapter {
11+
1012
@Bean
1113
ServletRegistrationBean h2servletRegistration() {
1214
ServletRegistrationBean registrationBean = new ServletRegistrationBean(new WebServlet());
1315
registrationBean.addUrlMappings("/console/*");
1416
return registrationBean;
1517
}
18+
1619
}

src/main/java/com/veosaf/bookRental/dto/BookDto.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
package com.veosaf.bookRental.dto;
22

3+
import java.io.Serializable;
34
import java.util.Date;
45

5-
public class BookDto {
6+
public class BookDto implements Serializable {
7+
8+
/**
9+
*
10+
*/
11+
private static final long serialVersionUID = 1L;
612

713
private Long id;
814

src/main/java/com/veosaf/bookRental/dtoMappers/BookDtoMapper.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,6 @@ public interface BookDtoMapper {
1111

1212
List<BookDto> toBooksDto(List<Book> books);
1313

14+
Book toBook(BookDto bookDto);
15+
1416
}

src/main/java/com/veosaf/bookRental/dtoMappersImpl/BookDtoMapperImpl.java renamed to src/main/java/com/veosaf/bookRental/dtoMappers/impl/BookDtoMapperImpl.java

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.veosaf.bookRental.dtoMappersImpl;
1+
package com.veosaf.bookRental.dtoMappers.impl;
22

33
import java.util.ArrayList;
44
import java.util.List;
@@ -34,4 +34,17 @@ public List<BookDto> toBooksDto(List<Book> books) {
3434
return booksDto;
3535
}
3636

37+
@Override
38+
public Book toBook(BookDto bookDto) {
39+
if (bookDto == null) {
40+
return null;
41+
}
42+
Book book = new Book();
43+
book.setTitle(bookDto.getTitle());
44+
book.setAuthor(bookDto.getAuthor());
45+
book.setId(bookDto.getId());
46+
book.setPublicationDate(bookDto.getPublicationDate());
47+
return book;
48+
}
49+
3750
}

src/main/java/com/veosaf/bookRental/dtoMappersImpl/UserDtoMapperImpl.java renamed to src/main/java/com/veosaf/bookRental/dtoMappers/impl/UserDtoMapperImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.veosaf.bookRental.dtoMappersImpl;
1+
package com.veosaf.bookRental.dtoMappers.impl;
22

33
import org.springframework.stereotype.Service;
44

0 commit comments

Comments
 (0)