调整模板生成配置.

baomidou · Mar 30, 2024 · 6782dff · 6782dff
1 parent 81bcb97
commit 6782dff
Show file tree

Hide file tree

Showing 6 changed files with 90 additions and 10 deletions.
diff --git a/...lus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/StrategyConfig.java b/...lus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/StrategyConfig.java
@@ -360,7 +360,7 @@ public LikeTable getNotLikeTable() {
         return notLikeTable;
     }
 
-    @Nullable
+    @NotNull
     public IOutputFile getOutputFile() {
         return outputFile;
     }

diff --git a/...lus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/TemplateConfig.java b/...lus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/TemplateConfig.java
@@ -29,6 +29,10 @@
  * 模板路径配置项
  *
  * @author tzg hubin
+ * @see StrategyConfig.Builder#entityBuilder()
+ * @see StrategyConfig.Builder#serviceBuilder()
+ * @see StrategyConfig.Builder#mapperBuilder()
+ * @see StrategyConfig.Builder#controllerBuilder()
  * @since 2017-06-17
  * @deprecated 3.5.6 {@link StrategyConfig}
  */
@@ -128,8 +132,18 @@ public String getEntity(boolean kotlin) {
      *
      * @param templateTypes 模板类型
      * @return this
+     * @see Entity.Builder#disable()
+     * @see Service.Builder#disable()
+     * @see Service.Builder#disableService()
+     * @see Service.Builder#disableServiceImpl()
+     * @see Controller.Builder#disable()
+     * @see Mapper.Builder#disable()
+     * @see Mapper.Builder#disableMapper()
+     * @see Mapper.Builder#disableMapperXml()
      * @since 3.3.2
+     * @deprecated 3.5.6
      */
+    @Deprecated
     public TemplateConfig disable(@NotNull TemplateType... templateTypes) {
         if (templateTypes != null) {
             for (TemplateType templateType : templateTypes) {
@@ -166,8 +180,18 @@ public TemplateConfig disable(@NotNull TemplateType... templateTypes) {
      * 禁用全部模板
      *
      * @return this
+     * @see Entity.Builder#disable()
+     * @see Service.Builder#disable()
+     * @see Service.Builder#disableService()
+     * @see Service.Builder#disableServiceImpl()
+     * @see Controller.Builder#disable()
+     * @see Mapper.Builder#disable()
+     * @see Mapper.Builder#disableMapper()
+     * @see Mapper.Builder#disableMapperXml()
      * @since 3.5.0
+     * @deprecated 3.5.6
      */
+    @Deprecated
     public TemplateConfig disable() {
         return disable(TemplateType.values());
     }

diff --git a/...generator/src/main/java/com/baomidou/mybatisplus/generator/config/builder/Controller.java b/...generator/src/main/java/com/baomidou/mybatisplus/generator/config/builder/Controller.java
@@ -233,7 +233,7 @@ public Builder disable() {
          * @return this
          * @since 3.5.6
          */
-        public Builder template(String template) {
+        public Builder template(@NotNull String template) {
             this.controller.templatePath = template;
             return this;
         }

diff --git a/...lus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/builder/Entity.java b/...lus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/builder/Entity.java
@@ -94,7 +94,7 @@ private Entity() {
 
     /**
      * 自定义忽略字段
-     * https://github.com/baomidou/generator/issues/46
+     * <a href="https://github.com/baomidou/generator/issues/46">...</a>
      */
     private final Set<String> ignoreColumns = new HashSet<>();
 
@@ -221,7 +221,7 @@ private Entity() {
      * @since 3.5.6
      */
     @Getter
-    private boolean generate;
+    private boolean generate = true;
 
     /**
      * <p>
@@ -665,6 +665,16 @@ public Builder kotlinTemplatePath(String template) {
             return this;
         }
 
+        /**
+         * 禁用实体生成
+         *
+         * @return this
+         * @since 3.5.6
+         */
+        public Builder disable() {
+            this.entity.generate = false;
+            return this;
+        }
 
         public Entity get() {
             String superClass = this.entity.superClass;

diff --git a/...lus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/builder/Mapper.java b/...lus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/builder/Mapper.java
@@ -346,7 +346,7 @@ public Builder enableFileOverride() {
          * @return this
          * @since 3.5.6
          */
-        public Builder mapperTemplate(String template) {
+        public Builder mapperTemplate(@NotNull String template) {
             this.mapper.mapperTemplatePath = template;
             return this;
         }
@@ -357,11 +357,45 @@ public Builder mapperTemplate(String template) {
          * @return this
          * @since 3.5.6
          */
-        public Builder mapperXmlTemplate(String template) {
+        public Builder mapperXmlTemplate(@NotNull String template) {
             this.mapper.mapperXmlTemplatePath = template;
             return this;
         }
 
+        /**
+         * 禁用Mapper生成
+         *
+         * @return this
+         * @since 3.5.6
+         */
+        public Builder disable() {
+            this.mapper.generateMapper = false;
+            this.mapper.generateMapperXml = false;
+            return this;
+        }
+
+        /**
+         * 禁用Mapper接口生成
+         *
+         * @return this
+         * @since 3.5.6
+         */
+        public Builder disableMapper() {
+            this.mapper.generateMapper = false;
+            return this;
+        }
+
+        /**
+         * 禁用MapperXml生成
+         *
+         * @return this
+         * @since 3.5.6
+         */
+        public Builder disableMapperXml() {
+            this.mapper.generateMapperXml = false;
+            return this;
+        }
+
         @NotNull
         public Mapper get() {
             return this.mapper;

diff --git a/...us-generator/src/main/java/com/baomidou/mybatisplus/generator/config/builder/Service.java b/...us-generator/src/main/java/com/baomidou/mybatisplus/generator/config/builder/Service.java
@@ -48,7 +48,7 @@ private Service() {
      * @since 3.5.6
      */
     @Getter
-    private boolean generateServiceImpl = false;
+    private boolean generateServiceImpl = true;
 
 
     /**
@@ -57,7 +57,7 @@ private Service() {
      * @since 3.5.6
      */
     @Getter
-    private boolean generateService = false;
+    private boolean generateService = true;
 
     /**
      * @since 3.5.6
@@ -252,6 +252,18 @@ public Builder enableFileOverride() {
             return this;
         }
 
+        /**
+         * 禁用生成Service
+         *
+         * @return this
+         * @since 3.5.6
+         */
+        public Builder disable() {
+            this.service.generateService = false;
+            this.service.generateServiceImpl = false;
+            return this;
+        }
+
         /**
          * 禁用生成
          *
@@ -280,7 +292,7 @@ public Builder disableServiceImpl() {
          * @return this
          * @since 3.5.6
          */
-        public Builder serviceTemplate(String template) {
+        public Builder serviceTemplate(@NotNull String template) {
             this.service.serviceTemplate = template;
             return this;
         }
@@ -291,7 +303,7 @@ public Builder serviceTemplate(String template) {
          * @return this
          * @since 3.5.6
          */
-        public Builder serviceImplTemplate(String template) {
+        public Builder serviceImplTemplate(@NotNull String template) {
             this.service.serviceImplTemplate = template;
             return this;
         }