Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix code style check #308

Merged
merged 1 commit into from
Jul 24, 2024
Merged

fix code style check #308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions src/main/java/org/nebula/contrib/ngbatis/NgbatisContextInitializer.java
View file
Open in desktop
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
4 changes: 3 additions & 1 deletion src/main/java/org/nebula/contrib/ngbatis/binding/beetl/functions/KvFn.java
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions ...odels/ext/SettableSelfSignedSSLParam.java → ...odels/ext/SettableSelfSignedSslParam.java
View file
Open in desktop
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
Loading