Skip to content

Spring integration test #214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 23 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
refactor
nraigosam committed Jun 1, 2023
commit 07997703bc0cf3f055c45e25522df97e7ae3e0d3
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.0.5</version>
<version>2.1.0.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>

Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@
import guru.springframework.repositories.CategoryRepository;
import guru.springframework.repositories.RecipeRepository;
import guru.springframework.repositories.UnitOfMeasureRepository;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.ApplicationListener;
import org.springframework.context.event.ContextRefreshedEvent;
import org.springframework.stereotype.Component;
@@ -16,6 +17,7 @@
/**
* Created by jt on 6/13/17.
*/
@Slf4j
@Component
public class RecipeBootstrap implements ApplicationListener<ContextRefreshedEvent> {

@@ -32,6 +34,7 @@ public RecipeBootstrap(CategoryRepository categoryRepository, RecipeRepository r
@Override
public void onApplicationEvent(ContextRefreshedEvent event) {
recipeRepository.saveAll(getRecipes());
log.debug("Loading boostrap data");
}

private List<Recipe> getRecipes() {
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package guru.springframework.controllers;

import guru.springframework.services.RecipeService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;

@Slf4j
@Controller
public class IndexController {

@@ -16,6 +18,7 @@ public IndexController(RecipeService recipeService) {

@RequestMapping({"", "/", "/index"})
public String getIndexPage(Model model) {
log.debug("getting index page");

model.addAttribute("recipes", recipeService.getRecipes());

2 changes: 1 addition & 1 deletion src/main/java/guru/springframework/domain/Category.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package guru.springframework.domain;

import jakarta.persistence.*;
import javax.persistence.*;
import lombok.*;

import java.util.Set;
45 changes: 4 additions & 41 deletions src/main/java/guru/springframework/domain/Ingredient.java
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
package guru.springframework.domain;

import jakarta.persistence.*;
import javax.persistence.*;
import lombok.Data;

import java.math.BigDecimal;

@Data
@Entity
public class Ingredient {

@@ -33,44 +36,4 @@ public Ingredient(String description, BigDecimal amount, UnitOfMeasure uom, Reci
this.uom = uom;
this.recipe = recipe;
}

public Long getId() {
return id;
}

public void setId(Long id) {
this.id = id;
}

public String getDescription() {
return description;
}

public void setDescription(String description) {
this.description = description;
}

public BigDecimal getAmount() {
return amount;
}

public void setAmount(BigDecimal amount) {
this.amount = amount;
}

public UnitOfMeasure getUom() {
return uom;
}

public void setUom(UnitOfMeasure uom) {
this.uom = uom;
}

public Recipe getRecipe() {
return recipe;
}

public void setRecipe(Recipe recipe) {
this.recipe = recipe;
}
}
27 changes: 3 additions & 24 deletions src/main/java/guru/springframework/domain/Notes.java
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
package guru.springframework.domain;

import jakarta.persistence.*;
import javax.persistence.*;
import lombok.*;


/**
* Created by jt on 6/13/17.
*/
@Data
@Entity
public class Notes {

@@ -19,27 +21,4 @@ public class Notes {
@Lob
private String recipeNotes;

public Long getId() {
return id;
}

public void setId(Long id) {
this.id = id;
}

public Recipe getRecipe() {
return recipe;
}

public void setRecipe(Recipe recipe) {
this.recipe = recipe;
}

public String getRecipeNotes() {
return recipeNotes;
}

public void setRecipeNotes(String recipeNotes) {
this.recipeNotes = recipeNotes;
}
}
2 changes: 1 addition & 1 deletion src/main/java/guru/springframework/domain/Recipe.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package guru.springframework.domain;

import jakarta.persistence.*;
import javax.persistence.*;
import lombok.Data;

import java.util.HashSet;
21 changes: 3 additions & 18 deletions src/main/java/guru/springframework/domain/UnitOfMeasure.java
Original file line number Diff line number Diff line change
@@ -1,30 +1,15 @@
package guru.springframework.domain;

import jakarta.persistence.*;
import javax.persistence.*;
import lombok.*;

@Data
@Entity
public class UnitOfMeasure {

@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
private String description;

public Long getId() {
return id;
}

public void setId(Long id) {
this.id = id;
}

public String getDescription() {
return description;
}

public void setDescription(String description) {
this.description = description;
}


}