Skip to content

GP-152: migrated to java 17, renamed modules to "exercises" #29

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

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
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
4 changes: 2 additions & 2 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 17
- name: Build with Maven
run: mvn -B package --file pom.xml
2 changes: 1 addition & 1 deletion 1-0-rdbms-and-sql/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>java-persistence-course</artifactId>
<artifactId>java-persistence-exercises</artifactId>
<groupId>com.bobocode</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import static org.mockito.Mockito.doThrow;

@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
public class ProductDaoTest {
class ProductDaoTest {
private static ProductDao productDao;
private static DataSource dataSource;

Expand Down
2 changes: 1 addition & 1 deletion 2-0-jdbc-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>java-persistence-course</artifactId>
<artifactId>java-persistence-exercises</artifactId>
<groupId>com.bobocode</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
Expand Down
2 changes: 1 addition & 1 deletion 3-0-jpa-and-hibernate/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>java-persistence-course</artifactId>
<artifactId>java-persistence-exercises</artifactId>
<groupId>com.bobocode</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
Expand Down
2 changes: 1 addition & 1 deletion 4-0-spring-data-jpa/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>java-persistence-course</artifactId>
<artifactId>java-persistence-exercises</artifactId>
<groupId>com.bobocode</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# <img src="https://raw.githubusercontent.com/bobocode-projects/resources/master/image/logo_transparent_background.png" height=50/>Welcome to the Java Persistence Course
# <img src="https://raw.githubusercontent.com/bobocode-projects/resources/master/image/logo_transparent_background.png" height=50/>Welcome to the Java Persistence exercises
Build strong skills that you will need for creating persistence layer in a real-world Enterprise Java development 💪

## Why
Most people don’t know how to learn Enterprise Java efficiently. So we created an **open-source education system**
that helps them to **master strong skills**, learn **world best practices** and build a **successful career**. 🚀

At Bobocode we have extensive experience in both building Enterprise Java applications and organizing efficient learning.
Therefore, this course covers what you need in the most efficient way. We believe that
Therefore, this exercises covers what you need in the most efficient way. We believe that
**the key to efficient learning is practice**. 💪 And as a software engineer, you should **spend as much time as you can in the IDE writing code**.
At the end of the day, this is the only place where you build software... 💻

8 changes: 4 additions & 4 deletions java-persistence-util/jpa-hibernate-util/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
Expand All @@ -13,9 +13,9 @@

<dependencies>
<dependency>
<groupId>io.codearte.jfairy</groupId>
<groupId>com.devskiller</groupId>
<artifactId>jfairy</artifactId>
<version>0.5.7</version>
<version>0.6.5</version>
</dependency>
<dependency>
<groupId>com.bobocode</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@

import com.bobocode.model.Account;
import com.bobocode.model.Gender;
import io.codearte.jfairy.Fairy;
import io.codearte.jfairy.producer.person.Person;

import com.devskiller.jfairy.Fairy;
import com.devskiller.jfairy.producer.person.Person;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
Expand All @@ -27,17 +26,16 @@ public static Account generateAccount() {
Person person = fairy.person();
Random random = new Random();


Account fakeAccount = new Account();
fakeAccount.setFirstName(person.getFirstName());
fakeAccount.setLastName(person.getLastName());
fakeAccount.setEmail(person.getEmail());
fakeAccount.setBirthday(LocalDate.of(
person.getDateOfBirth().getYear(),
person.getDateOfBirth().getMonthOfYear(),
person.getDateOfBirth().getMonth(),
person.getDateOfBirth().getDayOfMonth()));
fakeAccount.setGender(Gender.valueOf(person.getSex().name()));
BigDecimal balance = BigDecimal.valueOf(random.nextInt(200_000),2);
BigDecimal balance = BigDecimal.valueOf(random.nextInt(200_000), 2);
fakeAccount.setBalance(balance);
fakeAccount.setCreationTime(LocalDateTime.now());

Expand Down
2 changes: 1 addition & 1 deletion java-persistence-util/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>java-persistence-course</artifactId>
<artifactId>java-persistence-exercises</artifactId>
<groupId>com.bobocode</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
Expand Down
12 changes: 6 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
<modelVersion>4.0.0</modelVersion>

<groupId>com.bobocode</groupId>
<artifactId>java-persistence-course</artifactId>
<artifactId>java-persistence-exercises</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>

<properties>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

Expand Down Expand Up @@ -51,7 +51,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.16</version>
<version>1.18.24</version>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
Expand All @@ -61,13 +61,13 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.6.28</version>
<version>4.6.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<version>3.6.28</version>
<version>4.6.1</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down