Skip to content
Draft
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
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
package org.youngmonkeys.ezysmashers.app;

import com.tvd12.ezydata.database.EzyDatabaseContext;
import com.tvd12.ezyfox.bean.EzyBeanContextBuilder;
import com.tvd12.ezyfox.bean.impl.EzyBeanNameParser;
import com.tvd12.ezyfoxserver.context.EzyAppContext;
import com.tvd12.ezyfoxserver.context.EzyZoneContext;
import com.tvd12.ezyfoxserver.setting.EzyAppSetting;
import com.tvd12.ezyfoxserver.support.entry.EzyDefaultAppEntry;

import java.util.Properties;

public class AppEntry extends EzyDefaultAppEntry {

@Override
Expand All @@ -19,7 +24,17 @@ protected void postConfig(EzyAppContext ctx) {

@Override
protected void setupBeanContext(EzyAppContext context, EzyBeanContextBuilder builder) {
EzyZoneContext zoneContext = context.getParent();
EzyDatabaseContext databaseContext = zoneContext.getProperty(
EzyDatabaseContext.class
);
databaseContext.getRepositories().forEach((repoType, repo) -> {
builder.addSingleton(EzyBeanNameParser.getBeanName(repoType), repo);
});
Properties pluginProperties = zoneContext.getProperty("pluginProperties");
EzyAppSetting setting = context.getApp().getSetting();
builder.addProperties("EzySmashers-common-config.properties");
builder.addProperties(pluginProperties);
builder.addProperties(getConfigFile(setting));
}

Expand Down
53 changes: 53 additions & 0 deletions server/EzySmashers-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,61 @@
<dependency>
<groupId>com.tvd12</groupId>
<artifactId>ezyfox-server-support</artifactId>
<version>${ezy.server.version}</version>
</dependency>
<dependency>
<groupId>com.tvd12</groupId>
<artifactId>ezydata-jpa</artifactId>
<version>${ezy.version}</version>
</dependency>
<dependency>
<groupId>com.tvd12</groupId>
<artifactId>ezyhttp-client</artifactId>
<version>${ezy.http.version}</version>
</dependency>
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>${hikaricp.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>javax.persistence-api</artifactId>
<version>${javax.persistence.version}</version>
</dependency>
<dependency>
<groupId>javax.transaction</groupId>
<artifactId>javax.transaction-api</artifactId>
<version>${javax.transaction.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${javax.servlet.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>${hibernate.version}</version>
</dependency>
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<version>${mysql.connector.version}</version>
<exclusions>
<exclusion>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

</project>
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
package org.youngmonkeys.ezysmashers.common.entity;

import com.tvd12.ezyfox.annotation.EzyId;
import com.tvd12.ezyfox.database.annotation.EzyCollection;
import lombok.Data;

import javax.persistence.*;

@Data
@EzyCollection
@Entity
@Table(name = "users")
public class User {
@EzyId
Long id;

String username;
String password;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
private String username;
private String password;
}

Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package org.youngmonkeys.ezysmashers.common.repo;

import com.tvd12.ezydata.mongodb.EzyMongoRepository;
import com.tvd12.ezydata.database.EzyDatabaseRepository;
import com.tvd12.ezyfox.database.annotation.EzyRepository;
import org.youngmonkeys.ezysmashers.common.entity.User;

@EzyRepository("userRepo")
public interface UserRepo extends EzyMongoRepository<Long, User> {
public interface UserRepo extends EzyDatabaseRepository<Long, User> {
}

Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
hello=world
database.mongo.uri=mongodb://root:123456@127.0.0.1:27017/ezy-smashers
database.mongo.database=ezy-smashers
database.mongo.collection.naming.case=UNDERSCORE
database.mongo.collection.naming.ignored_suffix=Entity
datasource.jdbc_url=jdbc:mysql://root:12345678@localhost:3306/EzySmashers
datasource.driver_class_name=com.mysql.cj.jdbc.Driver
Original file line number Diff line number Diff line change
@@ -1,8 +1,20 @@
package org.youngmonkeys.ezysmashers.plugin;

import com.tvd12.ezydata.database.EzyDatabaseContext;
import com.tvd12.ezydata.jpa.EzyJpaDatabaseContextBuilder;
import com.tvd12.ezydata.jpa.loader.EzyJpaDataSourceLoader;
import com.tvd12.ezydata.jpa.loader.EzyJpaEntityManagerFactoryLoader;
import com.tvd12.ezyfox.bean.EzyBeanContextBuilder;
import com.tvd12.ezyfox.bean.impl.EzyBeanNameParser;
import com.tvd12.ezyfoxserver.context.EzyPluginContext;
import com.tvd12.ezyfoxserver.context.EzyZoneContext;
import com.tvd12.ezyfoxserver.setting.EzyPluginSetting;
import com.tvd12.ezyfoxserver.support.entry.EzyDefaultPluginEntry;

import javax.persistence.EntityManagerFactory;
import javax.sql.DataSource;
import java.util.Properties;

public class PluginEntry extends EzyDefaultPluginEntry {

@Override
Expand All @@ -15,6 +27,45 @@ protected void postConfig(EzyPluginContext ctx) {
logger.info("\n=================== EzySmashers PLUGIN END CONFIG ================\n");
}

@Override
protected void setupBeanContext(
EzyPluginContext context,
EzyBeanContextBuilder builder
) {
EzyPluginSetting setting = context.getPlugin().getSetting();
builder.addProperties("EzySmashers-common-config.properties");
Properties properties = builder.getProperties();
EzyDatabaseContext databaseContext = databaseContext(properties);
databaseContext.getRepositories().forEach((repoType, repo) -> {
builder.addSingleton(EzyBeanNameParser.getBeanName(repoType), repo);
});
EzyZoneContext zoneContext = context.getParent();
zoneContext.setProperty("pluginProperties", properties);
zoneContext.setProperty(EzyDatabaseContext.class, databaseContext);
}

private EzyDatabaseContext databaseContext(Properties properties) {
return new EzyJpaDatabaseContextBuilder()
.properties(properties)
.entityManagerFactory(entityManagerFactory(properties))
.scan("org.youngmonkeys.ezysmashers")
.build();
}

private EntityManagerFactory entityManagerFactory(Properties properties) {
return new EzyJpaEntityManagerFactoryLoader()
.entityPackage("org.youngmonkeys.ezysmashers")
.dataSource(dataSource(properties))
.properties(properties)
.load("Default");
}

private DataSource dataSource(Properties properties) {
return new EzyJpaDataSourceLoader()
.properties(properties, "datasource")
.load();
}

@Override
protected String[] getScanablePackages() {
return new String[]{
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,13 @@
public class UserService {

private final UserRepo userRepo;
private final MaxIdService maxIdService;

public void saveUser(User user) {
userRepo.save(user);
}

public User createUser(String username, String password) {
User user = new User();
user.setId(maxIdService.incrementAndGet("user"));
user.setUsername(username);
user.setPassword(password);
userRepo.save(user);
Expand Down
2 changes: 1 addition & 1 deletion server/EzySmashers-startup/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<dependency>
<groupId>com.tvd12</groupId>
<artifactId>ezyfox-server-embedded</artifactId>
<version>${ezy.version}</version>
<version>${ezy.server.version}</version>
</dependency>
<dependency>
<groupId>com.tvd12</groupId>
Expand Down
17 changes: 11 additions & 6 deletions server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,17 @@
<directory.entries>entries</directory.entries>
<directory.common>common</directory.common>
<ezy.version>1.2.8</ezy.version>
<ezy.server.version>1.2.8.1</ezy.server.version>
<ezy.boot.version>1.1.0</ezy.boot.version>
<ezy.client.version>1.2.5</ezy.client.version>
<ezy.http.version>1.2.7</ezy.http.version>
<javax.persistence.version>2.2</javax.persistence.version>
<javax.transaction.version>1.3</javax.transaction.version>
<jaxb.version>2.3.8</jaxb.version>
<hibernate.version>5.6.15.Final</hibernate.version>
<hikaricp.version>4.0.3</hikaricp.version>
<mysql.connector.version>8.0.32</mysql.connector.version>
<javax.servlet.version>3.1.0</javax.servlet.version>
</properties>

<build>
Expand Down Expand Up @@ -61,12 +71,7 @@
<dependency>
<groupId>com.tvd12</groupId>
<artifactId>ezyfox-server-core</artifactId>
<version>${ezy.version}</version>
</dependency>
<dependency>
<groupId>com.tvd12</groupId>
<artifactId>ezydata-mongodb</artifactId>
<version>${ezy.version}</version>
<version>${ezy.server.version}</version>
</dependency>
<dependency>
<groupId>com.tvd12</groupId>
Expand Down