|
11 | 11 | import org.javawebstack.httpserver.transformer.response.JsonResponseTransformer; |
12 | 12 | import org.javawebstack.injector.Injector; |
13 | 13 | import org.javawebstack.injector.SimpleInjector; |
| 14 | +import org.javawebstack.orm.exception.ORMConfigurationException; |
14 | 15 | import org.javawebstack.orm.wrapper.MySQL; |
15 | 16 | import org.javawebstack.orm.wrapper.SQL; |
16 | 17 | import org.javawebstack.orm.wrapper.SQLite; |
@@ -61,9 +62,15 @@ public WebApplication(){ |
61 | 62 | sql = null; |
62 | 63 | } |
63 | 64 | if(sql != null){ |
64 | | - modules.forEach(m -> m.beforeSetupModels(this, sql)); |
65 | | - setupModels(sql); |
66 | | - modules.forEach(m -> m.setupModels(this, sql)); |
| 65 | + try { |
| 66 | + for(Module m : modules) |
| 67 | + m.beforeSetupModels(this, sql); |
| 68 | + setupModels(sql); |
| 69 | + for(Module m : modules) |
| 70 | + m.setupModels(this, sql); |
| 71 | + }catch (ORMConfigurationException ex){ |
| 72 | + ex.printStackTrace(); |
| 73 | + } |
67 | 74 | } |
68 | 75 | modules.forEach(m -> m.beforeSetupInjection(this, injector)); |
69 | 76 | setupInjection(injector); |
@@ -124,7 +131,7 @@ public Crypt getCrypt(){ |
124 | 131 | public abstract void setupModules(); |
125 | 132 | public abstract void setupConfig(Config config); |
126 | 133 | public abstract void setupInjection(SimpleInjector injector); |
127 | | - public abstract void setupModels(SQL sql); |
| 134 | + public abstract void setupModels(SQL sql) throws ORMConfigurationException; |
128 | 135 | public abstract void setupServer(HTTPServer server); |
129 | 136 |
|
130 | 137 | public void run(){ |
|
0 commit comments