diff --git a/src/main/java/org/redkale/boot/Application.java b/src/main/java/org/redkale/boot/Application.java index df907de01..42e82b393 100644 --- a/src/main/java/org/redkale/boot/Application.java +++ b/src/main/java/org/redkale/boot/Application.java @@ -387,7 +387,7 @@ public final class Application { return application; } catch (Exception e) { logger.log(Level.SEVERE, "Resource inject error", e); - return null; + throw e instanceof RuntimeException ? (RuntimeException) e : new RedkaleException(e); } } @@ -412,7 +412,7 @@ public final class Application { return rs; } catch (Exception e) { logger.log(Level.SEVERE, "Resource inject error", e); - return null; + throw e instanceof RuntimeException ? (RuntimeException) e : new RedkaleException(e); } } @@ -445,7 +445,7 @@ public final class Application { return server; } catch (Exception e) { logger.log(Level.SEVERE, "Resource inject error", e); - return null; + throw e instanceof RuntimeException ? (RuntimeException) e : new RedkaleException(e); } } @@ -478,7 +478,7 @@ public final class Application { return server; } catch (Exception e) { logger.log(Level.SEVERE, "Resource inject error", e); - return null; + throw e instanceof RuntimeException ? (RuntimeException) e : new RedkaleException(e); } } @@ -511,7 +511,7 @@ public final class Application { return server; } catch (Exception e) { logger.log(Level.SEVERE, "Resource inject error", e); - return null; + throw e instanceof RuntimeException ? (RuntimeException) e : new RedkaleException(e); } } @@ -567,7 +567,7 @@ public final class Application { return httpClient; } catch (Exception e) { logger.log(Level.SEVERE, WebClient.class.getSimpleName() + " inject error", e); - return null; + throw e instanceof RuntimeException ? (RuntimeException) e : new RedkaleException(e); } } @@ -608,7 +608,7 @@ public final class Application { return rpcClient; } catch (Exception e) { logger.log(Level.SEVERE, HttpRpcClient.class.getSimpleName() + " inject error", e); - return null; + throw e instanceof RuntimeException ? (RuntimeException) e : new RedkaleException(e); } } diff --git a/src/main/java/org/redkale/boot/NodeHttpServer.java b/src/main/java/org/redkale/boot/NodeHttpServer.java index 6a31b3627..5050a663a 100644 --- a/src/main/java/org/redkale/boot/NodeHttpServer.java +++ b/src/main/java/org/redkale/boot/NodeHttpServer.java @@ -185,7 +185,7 @@ public class NodeHttpServer extends NodeServer { } } catch (Exception e) { logger.log(Level.SEVERE, "WebSocketNode inject error", e); - return null; + throw e instanceof RuntimeException ? (RuntimeException) e : new RedkaleException(e); } } diff --git a/src/main/java/org/redkale/boot/NodeServer.java b/src/main/java/org/redkale/boot/NodeServer.java index 2017dc5fa..d4cc30b9d 100644 --- a/src/main/java/org/redkale/boot/NodeServer.java +++ b/src/main/java/org/redkale/boot/NodeServer.java @@ -297,7 +297,7 @@ public abstract class NodeServer { return nodeService; } catch (Exception e) { logger.log(Level.SEVERE, "WebSocketNode inject error", e); - return null; + throw e instanceof RuntimeException ? (RuntimeException) e : new RedkaleException(e); } } @@ -451,10 +451,8 @@ public abstract class NodeServer { } serviceCount.incrementAndGet(); return service; - } catch (RuntimeException ex) { - throw ex; } catch (Exception e) { - throw new RedkaleException(e); + throw e instanceof RuntimeException ? (RuntimeException) e : new RedkaleException(e); } } diff --git a/src/main/java/org/redkale/source/spi/SourceModuleEngine.java b/src/main/java/org/redkale/source/spi/SourceModuleEngine.java index 8747e000d..d4201cba0 100644 --- a/src/main/java/org/redkale/source/spi/SourceModuleEngine.java +++ b/src/main/java/org/redkale/source/spi/SourceModuleEngine.java @@ -156,7 +156,8 @@ public class SourceModuleEngine extends ModuleEngine implements SourceManager { if (event.name().startsWith("redkale.datasource.") || event.name().startsWith("redkale.datasource[") || event.name().startsWith("redkale.cachesource.") || event.name().startsWith("redkale.cachesource[")) { if (event.name().endsWith(".name")) { - logger.log(Level.WARNING, "skip illegal key " + event.name() + " in source config " + (namespace == null ? "" : namespace) + ", key cannot endsWith '.name'"); + logger.log(Level.WARNING, "skip illegal key " + event.name() + + " in source config " + (namespace == null ? "" : namespace) + ", key cannot endsWith '.name'"); } else { if (!Objects.equals(event.newValue(), this.sourceProperties.getProperty(event.name()))) { if (event.newValue() == null) { @@ -373,7 +374,8 @@ public class SourceModuleEngine extends ModuleEngine implements SourceManager { if (!application.isCompileMode() && source instanceof Service) { ((Service) source).init(sourceConf); } - logger.info("Load CacheSource resourceName = '" + sourceName + "', source = " + source + " in " + (System.currentTimeMillis() - st) + " ms"); + logger.info("Load CacheSource resourceName = '" + sourceName + + "', source = " + source + " in " + (System.currentTimeMillis() - st) + " ms"); return source; } if (!sourceConf.getValue(AbstractCacheSource.CACHE_SOURCE_RESOURCE, "").isEmpty()) { @@ -389,7 +391,8 @@ public class SourceModuleEngine extends ModuleEngine implements SourceManager { cacheSources.add(source); resourceFactory.register(sourceName, CacheSource.class, source); - logger.info("Load CacheSource resourceName = '" + sourceName + "', source = " + source + " in " + (System.currentTimeMillis() - st) + " ms"); + logger.info("Load CacheSource resourceName = '" + sourceName + + "', source = " + source + " in " + (System.currentTimeMillis() - st) + " ms"); return source; } catch (RuntimeException ex) { throw ex; @@ -435,7 +438,8 @@ public class SourceModuleEngine extends ModuleEngine implements SourceManager { } dataSources.add(source); resourceFactory.register(sourceName, DataSource.class, source); - logger.info("Load DataSource resourceName = '" + sourceName + "', source = " + source + " in " + (System.currentTimeMillis() - st) + " ms"); + logger.info("Load DataSource resourceName = '" + sourceName + + "', source = " + source + " in " + (System.currentTimeMillis() - st) + " ms"); return source; } if (!sourceConf.getValue(DataSources.DATA_SOURCE_RESOURCE, "").isEmpty()) { @@ -475,7 +479,8 @@ public class SourceModuleEngine extends ModuleEngine implements SourceManager { resourceFactory.register(sourceName, DataJdbcSource.class, source); } } - logger.info("Load DataSource resourceName = '" + sourceName + "', source = " + source + " in " + (System.currentTimeMillis() - st) + " ms"); + logger.info("Load DataSource resourceName = '" + sourceName + + "', source = " + source + " in " + (System.currentTimeMillis() - st) + " ms"); return source; } catch (RuntimeException ex) { throw ex; @@ -519,7 +524,7 @@ public class SourceModuleEngine extends ModuleEngine implements SourceManager { private class DataSqlMapperLoader implements ResourceTypeLoader { @Override - public Object load(ResourceFactory rf, String srcResourceName, final Object srcObj, final String resourceName, Field field, final Object attachment) { + public Object load(ResourceFactory rf, String srcResourceName, Object srcObj, String resourceName, Field field, Object attachment) { try { if ((srcObj instanceof Service) && Sncp.isRemote((Service) srcObj)) { return null; //远程模式不得注入 @@ -536,7 +541,7 @@ public class SourceModuleEngine extends ModuleEngine implements SourceManager { return mapper; } catch (Exception e) { logger.log(Level.SEVERE, DataSqlMapper.class.getSimpleName() + " inject to " + srcObj + " error", e); - return null; + throw e instanceof RuntimeException ? (RuntimeException) e : new RedkaleException(e); } } @@ -549,7 +554,7 @@ public class SourceModuleEngine extends ModuleEngine implements SourceManager { private class DataSourceLoader implements ResourceTypeLoader { @Override - public Object load(ResourceFactory rf, String srcResourceName, final Object srcObj, final String resourceName, Field field, final Object attachment) { + public Object load(ResourceFactory rf, String srcResourceName, Object srcObj, String resourceName, Field field, Object attachment) { try { if ((srcObj instanceof Service) && Sncp.isRemote((Service) srcObj)) { return null; //远程模式不得注入 @@ -559,7 +564,7 @@ public class SourceModuleEngine extends ModuleEngine implements SourceManager { return source; } catch (Exception e) { logger.log(Level.SEVERE, "DataSource inject to " + srcObj + " error", e); - return null; + throw e instanceof RuntimeException ? (RuntimeException) e : new RedkaleException(e); } } @@ -572,7 +577,7 @@ public class SourceModuleEngine extends ModuleEngine implements SourceManager { private class CacheSourceLoader implements ResourceTypeLoader { @Override - public Object load(ResourceFactory rf, String srcResourceName, final Object srcObj, final String resourceName, Field field, final Object attachment) { + public Object load(ResourceFactory rf, String srcResourceName, Object srcObj, String resourceName, Field field, Object attachment) { try { if ((srcObj instanceof Service) && Sncp.isRemote((Service) srcObj)) { return null; //远程模式不得注入 @@ -587,12 +592,13 @@ public class SourceModuleEngine extends ModuleEngine implements SourceManager { if (res != null && res.required() && source == null) { throw new RedkaleException("CacheSource (resourceName = '" + resourceName + "') not found"); } else { - logger.info("Load CacheSource (type = " + (source == null ? null : source.getClass().getSimpleName()) + ", resourceName = '" + resourceName + "')"); + logger.info("Load CacheSource (type = " + (source == null ? null : source.getClass().getSimpleName()) + + ", resourceName = '" + resourceName + "')"); } return source; } catch (Exception e) { logger.log(Level.SEVERE, "DataSource inject error", e); - return null; + throw e instanceof RuntimeException ? (RuntimeException) e : new RedkaleException(e); } }