优化 hibernate-jakarta-solon-plugin

Author: noear

solon-jakarta-projects/solon-data/hibernate-jakarta-solon-plugin/src/main/java/org/hibernate/solon/integration/DbBeanInjectorImpl.java

@@ -1,30 +1,26 @@
 package org.hibernate.solon.integration;
 
 import org.hibernate.solon.annotation.Db;
-import org.noear.solon.core.BeanInjector;
 import org.noear.solon.core.BeanWrap;
 import org.noear.solon.core.VarHolder;
-import org.noear.solon.data.datasource.DsUtils;
+import org.noear.solon.data.datasource.DsInjector;
 
 /**
  * @author lingkang
  * @since 2.5
  */
-public class DbBeanInjectorImpl implements BeanInjector<Db> {
-    @Override
-    public void doInject(VarHolder vh, Db anno) {
-        vh.required(true);
+public class DbBeanInjectorImpl extends DsInjector<Db> {
+    public DbBeanInjectorImpl() {
+        super(Db::value);
 
-        DsUtils.observeDs(vh.context(), anno.value(), dsWrap -> {
-            inject0(vh, dsWrap);
-        });
+        addHandler(this::injectHandle);
     }
 
-    private void inject0(VarHolder vh, BeanWrap dsBw) {
+    public void injectHandle(VarHolder vh, BeanWrap dsBw) {
         HibernateAdapter adapter = HibernateAdapterManager.get(dsBw);
 
         if (adapter != null) {
             adapter.injectTo(vh);
         }
     }
-}
+}

solon-jakarta-projects/solon-data/hibernate-jakarta-solon-plugin/src/main/java/org/hibernate/solon/integration/HibernateAdapter.java

@@ -2,14 +2,15 @@
 
 import org.hibernate.SessionFactory;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
-import org.hibernate.cfg.Configuration;
 import org.noear.solon.Solon;
 import org.noear.solon.core.BeanWrap;
 import org.noear.solon.core.Props;
 import org.noear.solon.core.VarHolder;
 import org.noear.solon.core.util.ResourceUtil;
 
 import jakarta.persistence.EntityManagerFactory;
+
+import javax.security.auth.login.Configuration;
 import javax.sql.DataSource;
 
 /**

solon-jakarta-projects/solon-data/hibernate-jakarta-solon-plugin/src/main/java/org/hibernate/solon/integration/HibernateSolonPlugin.java

@@ -0,0 +1,68 @@
+package org.hibernate.solon.integration;
+
+import jakarta.persistence.spi.PersistenceProviderResolverHolder;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.PersistenceUnit;
+
+import org.hibernate.solon.annotation.Db;
+import org.noear.solon.Utils;
+import org.noear.solon.core.AppContext;
+import org.noear.solon.core.Plugin;
+import org.noear.solon.core.VarHolder;
+import org.noear.solon.data.datasource.DsInjector;
+import org.noear.solon.data.datasource.DsUtils;
+
+import javax.sql.DataSource;
+
+/**
+ * @author noear
+ * @since 2.5
+ * @since 3.4
+ */
+public class HibernateSolonPlugin implements Plugin {
+
+    @Override
+    public void start(AppContext context) throws Throwable {
+        //增加 jpa 的 solon yml 配置支持
+        PersistenceProviderResolverHolder
+                .getPersistenceProviderResolver()
+                .getPersistenceProviders()
+                .add(new JpaPersistenceProvider());
+
+        context.subWrapsOfType(DataSource.class, HibernateAdapterManager::register);
+
+        //添加 db 注入处理
+        DbBeanInjectorImpl dbBeanInjector = new DbBeanInjectorImpl();
+        context.beanInjectorAdd(Db.class, dbBeanInjector);
+        DsInjector.getDefault().addHandler(dbBeanInjector::injectHandle);
+
+        // 标准 jpa PersistenceContext 注入支持
+        //PersistenceUnit
+        context.beanInjectorAdd(PersistenceContext.class, this::persistenceContextInject);
+        context.beanInjectorAdd(PersistenceUnit.class, this::persistenceUnitInject);
+    }
+
+    private void persistenceContextInject(VarHolder vh, PersistenceContext anno) {
+        String unitName = Utils.annoAlias(anno.unitName(), anno.name());
+
+        DsUtils.observeDs(vh.context(), unitName, dsBw -> {
+            HibernateAdapter adapter = HibernateAdapterManager.get(dsBw);
+
+            if (adapter != null) {
+                adapter.injectTo(vh);
+            }
+        });
+    }
+
+    private void persistenceUnitInject(VarHolder vh, PersistenceUnit anno) {
+        String unitName = Utils.annoAlias(anno.unitName(), anno.name());
+
+        DsUtils.observeDs(vh.context(), unitName, dsBw -> {
+            HibernateAdapter adapter = HibernateAdapterManager.get(dsBw);
+
+            if (adapter != null) {
+                adapter.injectTo(vh);
+            }
+        });
+    }
+}

solon-jakarta-projects/solon-data/hibernate-jakarta-solon-plugin/src/main/java/org/hibernate/solon/integration/XPluginImpl.java

@@ -1,2 +1,2 @@
-solon.plugin=org.hibernate.solon.integration.XPluginImpl
+solon.plugin=org.hibernate.solon.integration.HibernateSolonPlugin
 solon.plugin.priority=10