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

fixes #330 refactor module registry to add config name #331

Merged
merged 1 commit into from
Nov 12, 2023
Merged

fixes #330 refactor module registry to add config name #331

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
4 changes: 2 additions & 2 deletions access-control/src/main/java/com/networknt/openapi/AccessControlHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,13 +215,13 @@ public boolean isEnabled() {

@Override
public void register() {
ModuleRegistry.registerModule(AccessControlHandler.class.getName(), config.getMappedConfig(), null);
ModuleRegistry.registerModule(AccessControlConfig.CONFIG_NAME, AccessControlHandler.class.getName(), config.getMappedConfig(), null);
}

@Override
public void reload() {
config.reload();
ModuleRegistry.registerModule(AccessControlHandler.class.getName(), config.getMappedConfig(), null);
ModuleRegistry.registerModule(AccessControlConfig.CONFIG_NAME, AccessControlHandler.class.getName(), config.getMappedConfig(), null);
if (logger.isInfoEnabled()) logger.info("AccessControlHandler is reloaded.");
}
}
2 changes: 1 addition & 1 deletion openapi-meta/src/main/java/com/networknt/openapi/OpenApiHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ public boolean isEnabled() {

@Override
public void register() {
ModuleRegistry.registerModule(OpenApiHandler.class.getName(), config.getMappedConfig(), null);
ModuleRegistry.registerModule(OpenApiHandlerConfig.CONFIG_NAME, OpenApiHandler.class.getName(), config.getMappedConfig(), null);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion openapi-meta/src/main/java/com/networknt/openapi/OpenApiHandlerConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public class OpenApiHandlerConfig {
boolean ignoreInvalidPath;
Map<String, Object> pathSpecMapping;

private Config config;
private final Config config;
private Map<String, Object> mappedConfig;

private OpenApiHandlerConfig() {
Expand Down
2 changes: 1 addition & 1 deletion openapi-meta/src/test/java/com/networknt/openapi/parameter/ParameterHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public boolean isEnabled() {

@Override
public void register() {
ModuleRegistry.registerModule(ParameterHandler.class.getName(), null, null);

}

}
4 changes: 2 additions & 2 deletions openapi-security/src/main/java/com/networknt/openapi/JwtVerifyHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,14 +508,14 @@ public boolean isEnabled() {

@Override
public void register() {
ModuleRegistry.registerModule(JwtVerifyHandler.class.getName(), Config.getInstance().getJsonMapConfigNoCache(OPENAPI_SECURITY_CONFIG), null);
ModuleRegistry.registerModule(OPENAPI_SECURITY_CONFIG, JwtVerifyHandler.class.getName(), Config.getInstance().getJsonMapConfigNoCache(OPENAPI_SECURITY_CONFIG), null);
}

@Override
public void reload() {
config.reload(OPENAPI_SECURITY_CONFIG);
jwtVerifier = new JwtVerifier(config);
ModuleRegistry.registerModule(JwtVerifyHandler.class.getName(), Config.getInstance().getJsonMapConfigNoCache(OPENAPI_SECURITY_CONFIG), null);
ModuleRegistry.registerModule(OPENAPI_SECURITY_CONFIG, JwtVerifyHandler.class.getName(), Config.getInstance().getJsonMapConfigNoCache(OPENAPI_SECURITY_CONFIG), null);
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions openapi-security/src/main/java/com/networknt/openapi/SwtVerifyHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,13 @@ public boolean isEnabled() {

@Override
public void register() {
ModuleRegistry.registerModule(SwtVerifyHandler.class.getName(), Config.getInstance().getJsonMapConfigNoCache(OPENAPI_SECURITY_CONFIG), null);
ModuleRegistry.registerModule(OPENAPI_SECURITY_CONFIG, SwtVerifyHandler.class.getName(), Config.getInstance().getJsonMapConfigNoCache(OPENAPI_SECURITY_CONFIG), null);
}

@Override
public void reload() {
config.reload(OPENAPI_SECURITY_CONFIG);
ModuleRegistry.registerModule(SwtVerifyHandler.class.getName(), Config.getInstance().getJsonMapConfigNoCache(OPENAPI_SECURITY_CONFIG), null);
ModuleRegistry.registerModule(OPENAPI_SECURITY_CONFIG, SwtVerifyHandler.class.getName(), Config.getInstance().getJsonMapConfigNoCache(OPENAPI_SECURITY_CONFIG), null);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion openapi-security/src/main/java/com/networknt/openapi/UnifiedSecurityConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public class UnifiedSecurityConfig {
List<String> anonymousPrefixes;
List<UnifiedPathPrefixAuth> pathPrefixAuths;

private Config config;
private final Config config;
private Map<String, Object> mappedConfig;

private UnifiedSecurityConfig() {
Expand Down
4 changes: 2 additions & 2 deletions openapi-security/src/main/java/com/networknt/openapi/UnifiedSecurityHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,13 +253,13 @@ public boolean isEnabled() {

@Override
public void register() {
ModuleRegistry.registerModule(UnifiedSecurityHandler.class.getName(), Config.getInstance().getJsonMapConfigNoCache(UnifiedSecurityConfig.CONFIG_NAME), null);
ModuleRegistry.registerModule(UnifiedSecurityConfig.CONFIG_NAME, UnifiedSecurityHandler.class.getName(), Config.getInstance().getJsonMapConfigNoCache(UnifiedSecurityConfig.CONFIG_NAME), null);
}

@Override
public void reload() {
config.reload();
ModuleRegistry.registerModule(UnifiedSecurityHandler.class.getName(), Config.getInstance().getJsonMapConfigNoCache(UnifiedSecurityConfig.CONFIG_NAME), null);
ModuleRegistry.registerModule(UnifiedSecurityConfig.CONFIG_NAME, UnifiedSecurityHandler.class.getName(), Config.getInstance().getJsonMapConfigNoCache(UnifiedSecurityConfig.CONFIG_NAME), null);
}

}
2 changes: 1 addition & 1 deletion openapi-security/src/test/java/com/networknt/openapi/TestServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ private TestServer() {
}

public ServerConfig getServerConfig() {
return Server.getServerConfig();
return ServerConfig.getInstance();
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions openapi-validator/src/main/java/com/networknt/openapi/ValidatorHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ public boolean isEnabled() {

@Override
public void register() {
ModuleRegistry.registerModule(ValidatorHandler.class.getName(), config.getMappedConfig(), null);
ModuleRegistry.registerModule(OPENAPI_CONFIG_NAME, ValidatorHandler.class.getName(), config.getMappedConfig(), null);
}

@Override
Expand All @@ -195,6 +195,6 @@ public void reload() {
if(config == null) {
config.reload(CONFIG_NAME);
}
ModuleRegistry.registerModule(ValidatorHandler.class.getName(), config.getMappedConfig(), null);
ModuleRegistry.registerModule(OPENAPI_CONFIG_NAME, ValidatorHandler.class.getName(), config.getMappedConfig(), null);
}
}
2 changes: 1 addition & 1 deletion openapi-validator/src/test/java/com/networknt/openapi/ParameterHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public boolean isEnabled() {

@Override
public void register() {
ModuleRegistry.registerModule(ParameterHandler.class.getName(), null, null);

}

}
4 changes: 4 additions & 0 deletions specification/src/main/java/com/networknt/specification/SpecDisplayHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import com.networknt.config.Config;
import com.networknt.handler.LightHttpHandler;
import com.networknt.utility.ModuleRegistry;
import io.undertow.server.HttpServerExchange;
import io.undertow.util.HttpString;

Expand All @@ -27,7 +28,10 @@
* @author Gavin Chen
*/
public class SpecDisplayHandler implements LightHttpHandler {
static SpecificationConfig config = (SpecificationConfig)Config.getInstance().getJsonObjectConfig(SpecificationConfig.CONFIG_NAME, SpecificationConfig.class);
public SpecDisplayHandler(){
if(logger.isInfoEnabled()) logger.info("SpecDisplayHandler is constructed");
ModuleRegistry.registerModule(SpecificationConfig.CONFIG_NAME, SpecDisplayHandler.class.getName(), Config.getInstance().getJsonMapConfigNoCache(SpecificationConfig.CONFIG_NAME), null);
}

@Override
Expand Down