代码优化

smartboot · Nov 4, 2024 · f2ec819 · f2ec819
1 parent 191a678
commit f2ec819
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 3 deletions.
diff --git a/servlet-core/src/main/java/tech/smartboot/servlet/Container.java b/servlet-core/src/main/java/tech/smartboot/servlet/Container.java
@@ -401,6 +401,13 @@ private ServletContextRuntime getServletRuntime(String localPath, String context
         //set session timeout
         deploymentInfo.setSessionTimeout(webAppInfo.getSessionTimeout());
         deploymentInfo.setLoginConfig(webAppInfo.getLoginConfig());
+        if (StringUtils.isNotBlank(webAppInfo.getVersion())) {
+            String[] array = webAppInfo.getVersion().split("\\.");
+            if (array.length == 2) {
+                deploymentInfo.setEffectiveMajorVersion(Integer.parseInt(array[0]));
+                deploymentInfo.setEffectiveMinorVersion(Integer.parseInt(array[1]));
+            }
+        }
 //        if (webAppInfo.getLoginConfig() != null && webAppInfo.getLoginConfig().getLoginPage().endsWith(".jsp")) {
 //            servletRuntime.getServletContext().addJspFile("aaaaaa", webAppInfo.getLoginConfig().getLoginPage());
 //        }

diff --git a/servlet-core/src/main/java/tech/smartboot/servlet/WebXmlParseEngine.java b/servlet-core/src/main/java/tech/smartboot/servlet/WebXmlParseEngine.java
@@ -96,6 +96,7 @@ private Element commonParse(WebAppInfo webAppInfo, InputStream contextFile) thro
         Element parentElement = document.getDocumentElement();
 
         webAppInfo.setMetadataComplete("true".equals(parentElement.getAttribute("metadata-complete")));
+        webAppInfo.setVersion(parentElement.getAttribute("version"));
         parseBasicInfo(webAppInfo, parentElement);
 
         parseServlet(webAppInfo, parentElement);

diff --git a/servlet-core/src/main/java/tech/smartboot/servlet/conf/DeploymentInfo.java b/servlet-core/src/main/java/tech/smartboot/servlet/conf/DeploymentInfo.java
@@ -40,6 +40,8 @@
  * @version V1.0 , 2019/12/11
  */
 public class DeploymentInfo {
+    private int effectiveMajorVersion;
+    private int effectiveMinorVersion;
     private final Map<String, ServletInfo> servlets = new HashMap<>();
     private final List<ServletMappingInfo> servletMappings = new ArrayList<>();
     private final Map<Integer, ErrorPageInfo> errorStatusPages = new HashMap<>();
@@ -324,5 +326,20 @@ public Set<String> getSecurityRoles() {
     public void setDynamicListenerState(boolean dynamicListenerState) {
         this.dynamicListenerState = dynamicListenerState;
     }
-
+
+    public int getEffectiveMajorVersion() {
+        return effectiveMajorVersion;
+    }
+
+    public void setEffectiveMajorVersion(int effectiveMajorVersion) {
+        this.effectiveMajorVersion = effectiveMajorVersion;
+    }
+
+    public int getEffectiveMinorVersion() {
+        return effectiveMinorVersion;
+    }
+
+    public void setEffectiveMinorVersion(int effectiveMinorVersion) {
+        this.effectiveMinorVersion = effectiveMinorVersion;
+    }
 }
diff --git a/servlet-core/src/main/java/tech/smartboot/servlet/conf/WebAppInfo.java b/servlet-core/src/main/java/tech/smartboot/servlet/conf/WebAppInfo.java
@@ -22,6 +22,7 @@
  * @version V1.0 , 2019/12/12
  */
 public class WebAppInfo {
+    private String version;
     private String displayName;
     private String description;
     private boolean metadataComplete;
@@ -190,4 +191,12 @@ public LoginConfig getLoginConfig() {
     public void setLoginConfig(LoginConfig loginConfig) {
         this.loginConfig = loginConfig;
     }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public void setVersion(String version) {
+        this.version = version;
+    }
 }
diff --git a/servlet-core/src/main/java/tech/smartboot/servlet/impl/ServletContextImpl.java b/servlet-core/src/main/java/tech/smartboot/servlet/impl/ServletContextImpl.java
@@ -120,13 +120,13 @@ public int getMinorVersion() {
 
     @Override
     public int getEffectiveMajorVersion() {
-        return 6;
+        return deploymentInfo.getEffectiveMajorVersion();
     }
 
     @Override
     public int getEffectiveMinorVersion() {
         checkContextInitializeState();
-        return 0;
+        return deploymentInfo.getEffectiveMinorVersion();
     }
 
     @Override
@@ -476,6 +476,7 @@ public FilterRegistration.Dynamic addFilter(String filterName, Class<? extends F
 
     @Override
     public <T extends Filter> T createFilter(Class<T> clazz) throws ServletException {
+        checkContextInitializeState();
         return newInstance(clazz);
     }