Skip to content

Commit

Permalink
Merge pull request #308 from CorvusYe/master
Browse files Browse the repository at this point in the history
fix code style check
  • Loading branch information
CorvusYe authored Jul 24, 2024
2 parents 6239e89 + afdf7f4 commit 7c4214f
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import org.nebula.contrib.ngbatis.config.NgbatisConfig;
import org.nebula.contrib.ngbatis.config.ParseCfgProps;
import org.nebula.contrib.ngbatis.models.ext.SettableCaSignedSslParam;
import org.nebula.contrib.ngbatis.models.ext.SettableSelfSignedSSLParam;
import org.nebula.contrib.ngbatis.models.ext.SettableSelfSignedSslParam;
import org.springframework.context.ApplicationContextInitializer;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.core.env.ConfigurableEnvironment;
Expand Down Expand Up @@ -118,7 +118,10 @@ private void confSsl(
ConfigurableEnvironment environment,
NebulaPoolConfig nebulaPoolConfig
) {
boolean enableSsl = environment.getProperty("nebula.pool-config.enable-ssl", Boolean.class, false);
boolean enableSsl = environment.getProperty(
"nebula.pool-config.enable-ssl", Boolean.class, false
);

nebulaPoolConfig.setEnableSsl(enableSsl);
if (enableSsl) {
SignMode signMode = environment.getProperty(
Expand All @@ -132,7 +135,7 @@ private void confSsl(
}

Class<? extends SSLParam> sslParamClass = signMode == SignMode.SELF_SIGNED
? SettableSelfSignedSSLParam.class
? SettableSelfSignedSslParam.class
: SettableCaSignedSslParam.class;

SSLParam sslParam = getConfig(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,9 @@ public Object call(Object entity, String prefix, Boolean excludePk, Boolean sele
continue;
}

boolean isVidField = field.isAnnotationPresent(SrcId.class) || field.isAnnotationPresent(DstId.class);
boolean isVidField =
field.isAnnotationPresent(SrcId.class) || field.isAnnotationPresent(DstId.class);

if (excludePk && isVidField) {
continue;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
* @since 2024-07-05 4:35
* <br>Now is history!
*/
public class SettableSelfSignedSSLParam extends SelfSignedSSLParam {
public class SettableSelfSignedSslParam extends SelfSignedSSLParam {

public SettableSelfSignedSSLParam() {
public SettableSelfSignedSslParam() {
super(null, null, null);
}

Expand Down

0 comments on commit 7c4214f

Please sign in to comment.