diff --git a/.idea/artifacts/AssemblyDemo_war.xml b/.idea/artifacts/AssemblyDemo_war.xml
deleted file mode 100644
index 1aa5b4cccec03cf58dd13ba0dfa1140f1de8e20b..0000000000000000000000000000000000000000
--- a/.idea/artifacts/AssemblyDemo_war.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- $PROJECT_DIR$/AssemblyDemo/target
-
-
- AssemblyDemo
- war
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/artifacts/AssemblyDemo_war_exploded.xml b/.idea/artifacts/AssemblyDemo_war_exploded.xml
deleted file mode 100644
index 21279d6c361918ce880bdeb3b0e16cc87aa0bfff..0000000000000000000000000000000000000000
--- a/.idea/artifacts/AssemblyDemo_war_exploded.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
- $PROJECT_DIR$/AssemblyDemo/target/AssemblyDemo
-
-
- true
- AssemblyDemo
- war
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/aws.xml b/.idea/aws.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b63b642cfb4254fc0f7058903abc5b481895c4ef
--- /dev/null
+++ b/.idea/aws.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 27f01937bd66b628d106173f9d39c8dd90b39e48..5618d571c2b07aeeb46ef97bd4037354add3e2ac 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -1,5 +1,8 @@
+
+
+
-
+
\ No newline at end of file
diff --git a/.idea/sonarlint/issuestore/index.pb b/.idea/sonarlint/issuestore/index.pb
index 12f724e53eae40ef5fab1c5d9f9dc1574ad5f71f..e2a6589693e618a7592be9f819e0f90f5302920c 100644
--- a/.idea/sonarlint/issuestore/index.pb
+++ b/.idea/sonarlint/issuestore/index.pb
@@ -7,8 +7,6 @@ Z
*AdapterModel/src/main/java/inter/Bird.java,7/d/7db4e423ecbd5c0da2e44e4343571e9ac0dfbdb6
]
-AdapterModel/src/main/java/adapter/Goose.java,a/6/a69b05067b7fb132341ada587df26ea8725829ca
-d
-4AdapterModel/src/main/java/adapter/GooseAdapter.java,4/2/421f7a21cc72f729965524d53ee3d437645963c1
e
5AdapterModel/src/main/java/adapter/ParrotAdapter.java,5/8/58f19e6637a22c4418ed9f21710d2604d3c21f05
[
@@ -16,10 +14,4 @@ e
`
0automaticAssembly/src/main/java/com/Starter.java,a/5/a5142007fdd3c2a7bb213014e7d0345f75a90ec1
s
-CautomaticAssembly/src/main/java/com/controller/HelloController.java,6/d/6d46effa53e9a69b409df41171b33cbe4b0ee319
-e
-5ProxyModel/src/main/java/inter/impl/CaculateImpl.java,1/c/1c400c06020b5007b891638669f3d2bc077eab6a
-\
-,ProxyModel/src/main/java/inter/MyRemote.java,b/9/b9eb101b3148282e97d5510bc3588810dfe84482
-k
-;.idea/libraries/Maven__org_projectlombok_lombok_1_18_12.xml,9/f/9f594e90f4f66752dc32a1fb95f99e1142cb6f27
\ No newline at end of file
+CautomaticAssembly/src/main/java/com/controller/HelloController.java,6/d/6d46effa53e9a69b409df41171b33cbe4b0ee319
\ No newline at end of file
diff --git a/.idea/sonarlint/securityhotspotstore/index.pb b/.idea/sonarlint/securityhotspotstore/index.pb
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d0812e1e437ceec6ed835cc94ee70f80f7220722..fbf2071a05cfb9697715df484d63804d59065b8c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,8 +4,11 @@
-
-
+
+
+
+
+
@@ -34,7 +37,7 @@
@@ -59,6 +62,9 @@
+
+
+
@@ -74,9 +80,17 @@
-
-
-
+
jr
@@ -84,8 +98,11 @@
+
+
+
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
-
@@ -425,7 +451,21 @@
1681186446281
-
+
+ 1692669016726
+
+
+
+ 1692669016726
+
+
+ 1692683453920
+
+
+
+ 1692683453920
+
+
@@ -452,28 +492,14 @@
-
+
+
+
false
true
-
-
-
-
- file://$PROJECT_DIR$/AdapterModel/src/main/java/inter/impl/Man.java
- 9
-
-
-
- file://$PROJECT_DIR$/AdapterModel/src/test/java/UdpSend.java
- 28
-
-
-
-
-
diff --git a/AdapterModel/src/main/java/adapter/GooseAdapter.java b/AdapterModel/src/main/java/adapter/GooseAdapter.java
index a9815273907b110539f724b04e513e48f2ad99e7..4d43bc516e7a9041b6ed107bd8cdae2c2ddedef4 100644
--- a/AdapterModel/src/main/java/adapter/GooseAdapter.java
+++ b/AdapterModel/src/main/java/adapter/GooseAdapter.java
@@ -11,7 +11,7 @@ import adapter.Goose;
*/
public class GooseAdapter implements Bird {
- private Goose goose;
+ private final Goose goose;
public GooseAdapter(Goose goose) {
this.goose = goose;
diff --git a/AdapterModel/src/main/java/adapter/PowerAdaptee.java b/AdapterModel/src/main/java/adapter/PowerAdaptee.java
index 83510b916ec8acbccb5e0e897e91b3ffef4c12b3..7445220f918d62143d50024ab3327fc340dce66e 100644
--- a/AdapterModel/src/main/java/adapter/PowerAdaptee.java
+++ b/AdapterModel/src/main/java/adapter/PowerAdaptee.java
@@ -2,10 +2,9 @@ package adapter;
public class PowerAdaptee {
- private int output = 220;
-
public int outPut220V(){
- System.out.println("电源输出电压:"+output+"V");
+ int output = 220;
+ System.out.println("电源输出电压:"+ output +"V");
return output;
}
}
diff --git a/AdapterModel/src/main/java/inter/Female.java b/AdapterModel/src/main/java/inter/Female.java
index 1a59f0bf07e1055f9ad6d87f901d89c9bf59618b..b3ac14558835a92dcb562d3ccba6b8f29fc640fb 100644
--- a/AdapterModel/src/main/java/inter/Female.java
+++ b/AdapterModel/src/main/java/inter/Female.java
@@ -2,7 +2,7 @@ package inter;
public abstract class Female {
public String sex="female";
- public String name="Tina";
+ public final String name="Tina";
public abstract void birthBaby(Male male);
}
diff --git a/AdapterModel/src/main/java/inter/Male.java b/AdapterModel/src/main/java/inter/Male.java
index 9b7733f68093a064e7e10bde865ba39186c1fe56..c210bc3454afdecc0cd62e092445fb0b4586f228 100644
--- a/AdapterModel/src/main/java/inter/Male.java
+++ b/AdapterModel/src/main/java/inter/Male.java
@@ -2,7 +2,7 @@ package inter;
public abstract class Male {
public String sex="male";
- public String name="Jack";
+ public final String name="Jack";
public abstract void birthBaby(Female female);
}
diff --git a/AdapterModel/src/main/java/inter/impl/ObjectAdapter.java b/AdapterModel/src/main/java/inter/impl/ObjectAdapter.java
index 4f09069f18b4ba33127897df27383fd38fea0152..0e98a9fe5b1667055e8ff9be907ff70a03cb369b 100644
--- a/AdapterModel/src/main/java/inter/impl/ObjectAdapter.java
+++ b/AdapterModel/src/main/java/inter/impl/ObjectAdapter.java
@@ -5,7 +5,7 @@ import inter.Target;
public class ObjectAdapter implements Target {
- private Adapter adapter;
+ private final Adapter adapter;
public ObjectAdapter(Adapter adapter) {
this.adapter = adapter;
diff --git a/BuildModel/src/main/java/buildInterface/impl/OfOBikeBuilder.java b/BuildModel/src/main/java/buildInterface/impl/OfOBikeBuilder.java
index a23a615dad04d88b2e714f4d9797809de10d83b5..04448b5e6c821de911883ff88f892c2c42c6177c 100644
--- a/BuildModel/src/main/java/buildInterface/impl/OfOBikeBuilder.java
+++ b/BuildModel/src/main/java/buildInterface/impl/OfOBikeBuilder.java
@@ -11,7 +11,7 @@ import buildInterface.BikeBuilder;
*/
public class OfOBikeBuilder implements BikeBuilder {
- private Bike bike = new Bike();
+ private final Bike bike = new Bike();
@Override
public void buildType() {
bike.setType("黑色轮胎");
diff --git a/BuildModel/src/main/java/enginer/EngineeringDepartment.java b/BuildModel/src/main/java/enginer/EngineeringDepartment.java
index d4876b2c3a6649adb7256088906bf03411c17ba4..c1bc64d15d70721a10d403555ea987623d881274 100644
--- a/BuildModel/src/main/java/enginer/EngineeringDepartment.java
+++ b/BuildModel/src/main/java/enginer/EngineeringDepartment.java
@@ -10,7 +10,7 @@ import buildInterface.BikeBuilder;
*/
public class EngineeringDepartment {
- private BikeBuilder bikeBuilder;
+ private final BikeBuilder bikeBuilder;
public EngineeringDepartment(BikeBuilder bikeBuilder) {
this.bikeBuilder = bikeBuilder;
diff --git a/CompositeModel/src/main/java/composite/impl/College.java b/CompositeModel/src/main/java/composite/impl/College.java
index 46155050084b5398492225e6aa110a0de3e03eed..0da060613763cc2bb3f61b014032c526e30f75c1 100644
--- a/CompositeModel/src/main/java/composite/impl/College.java
+++ b/CompositeModel/src/main/java/composite/impl/College.java
@@ -13,9 +13,9 @@ import java.util.List;
*/
public class College extends OrganizationComponent {
- String name;
- String description;
- List organizationComponents = new ArrayList();
+ final String name;
+ final String description;
+ final List organizationComponents = new ArrayList();
public College(String name, String description) {
this.name = name;
diff --git a/CompositeModel/src/main/java/composite/impl/Composite.java b/CompositeModel/src/main/java/composite/impl/Composite.java
index 08c1dd3ed8618ed6ae26ac21bd49d557fb1b818d..0fb2f3fbb74e5e4c2c568b3ff7d5cf8098c7069a 100644
--- a/CompositeModel/src/main/java/composite/impl/Composite.java
+++ b/CompositeModel/src/main/java/composite/impl/Composite.java
@@ -12,7 +12,7 @@ import java.util.ArrayList;
* @Version V1.0
**/
public class Composite implements Component{
- private ArrayList children = new ArrayList();
+ private final ArrayList children = new ArrayList();
@Override
public void add(Component c) {
diff --git a/CompositeModel/src/main/java/composite/impl/Department.java b/CompositeModel/src/main/java/composite/impl/Department.java
index 637f24e6fe551bcfaaec0f72d05373e0abb61b08..544eed1a3d7673448adfd92166ee8c9fc2e846b4 100644
--- a/CompositeModel/src/main/java/composite/impl/Department.java
+++ b/CompositeModel/src/main/java/composite/impl/Department.java
@@ -10,8 +10,8 @@ import composite.OrganizationComponent;
*/
public class Department extends OrganizationComponent {
- String name;
- String description;
+ final String name;
+ final String description;
public Department(String name, String description) {
this.name = name;
diff --git a/CompositeModel/src/main/java/composite/impl/Leaf.java b/CompositeModel/src/main/java/composite/impl/Leaf.java
index 723e3664015cc58ed33f90271a412a0591a25e04..429831fcabb4a55483fa9e316438d0050d6a8c73 100644
--- a/CompositeModel/src/main/java/composite/impl/Leaf.java
+++ b/CompositeModel/src/main/java/composite/impl/Leaf.java
@@ -11,7 +11,7 @@ import composite.Component;
**/
public class Leaf implements Component{
- private String name;
+ private final String name;
public Leaf(String name) {
this.name = name;
diff --git a/CompositeModel/src/main/java/composite/impl/OutputInfo.java b/CompositeModel/src/main/java/composite/impl/OutputInfo.java
index c1857c7015afafb2c8454af0bd2d2fd821fdb838..0cb56bb4cb285402b343ce36a1bc92c82a497a34 100644
--- a/CompositeModel/src/main/java/composite/impl/OutputInfo.java
+++ b/CompositeModel/src/main/java/composite/impl/OutputInfo.java
@@ -10,7 +10,7 @@ import composite.OrganizationComponent;
*/
public class OutputInfo {
- OrganizationComponent allOrganization;
+ final OrganizationComponent allOrganization;
public OutputInfo(OrganizationComponent allOrganization) {
this.allOrganization = allOrganization;
diff --git a/CompositeModel/src/main/java/composite/impl/University.java b/CompositeModel/src/main/java/composite/impl/University.java
index 64caaa1962d84d5fef4b11f28128701803c56231..3d2368ddf77e63623beebf9b6bd02219690bd7bb 100644
--- a/CompositeModel/src/main/java/composite/impl/University.java
+++ b/CompositeModel/src/main/java/composite/impl/University.java
@@ -13,9 +13,9 @@ import java.util.List;
*/
public class University extends OrganizationComponent {
- String name;
- String description;
- List organizationComponents = new ArrayList();
+ final String name;
+ final String description;
+ final List organizationComponents = new ArrayList();
public University(String name, String description) {
this.name = name;
diff --git a/DecoratorModel/src/main/java/component/impl/MilkTea.java b/DecoratorModel/src/main/java/component/MilkTea.java
similarity index 92%
rename from DecoratorModel/src/main/java/component/impl/MilkTea.java
rename to DecoratorModel/src/main/java/component/MilkTea.java
index 149f86f82edb4d8a079793d6eb9a98ff52d3c32f..bae2b88bc126b2fc0c549ffc740fc77179fb1464 100644
--- a/DecoratorModel/src/main/java/component/impl/MilkTea.java
+++ b/DecoratorModel/src/main/java/component/MilkTea.java
@@ -1,4 +1,4 @@
-package component.impl;
+package component;
import component.Tea;
diff --git a/DecoratorModel/src/main/java/decorator/Coffe.java b/DecoratorModel/src/main/java/decorator/Coffe.java
index e7267d5285780c21ff7a870c87012027d2181ef6..1c0011402005b026271237a61923204557846d19 100644
--- a/DecoratorModel/src/main/java/decorator/Coffe.java
+++ b/DecoratorModel/src/main/java/decorator/Coffe.java
@@ -12,7 +12,7 @@ import component.impl.CondimentDecorator;
public class Coffe extends CondimentDecorator {
//持有对象
- private Tea tea;
+ private final Tea tea;
public Coffe(Tea tea) {
this.tea = tea;
diff --git a/DecoratorModel/src/main/java/decorator/Pearl.java b/DecoratorModel/src/main/java/decorator/Pearl.java
index e63ba46548656d8021c6bb57dc9a234b5b798228..0596e0928d6ece7612fd3ae2189a5a543ea35055 100644
--- a/DecoratorModel/src/main/java/decorator/Pearl.java
+++ b/DecoratorModel/src/main/java/decorator/Pearl.java
@@ -12,7 +12,7 @@ import component.impl.CondimentDecorator;
public class Pearl extends CondimentDecorator {
//持有对装饰对象的引用
- private Tea tea;
+ private final Tea tea;
public Pearl(Tea tea) {
this.tea = tea;
diff --git a/DecoratorModel/src/test/java/TestDecorator.java b/DecoratorModel/src/test/java/TestDecorator.java
index 4c3d6e048ed7207821eaba973c80e3a12a2f6721..fe4d644c337bf00a8e585e975d2ac5b7b0b36026 100644
--- a/DecoratorModel/src/test/java/TestDecorator.java
+++ b/DecoratorModel/src/test/java/TestDecorator.java
@@ -1,5 +1,5 @@
import component.Tea;
-import component.impl.MilkTea;
+import component.MilkTea;
import decorator.Coffe;
import decorator.Pearl;
import org.junit.Test;
diff --git a/IngredientFactory/src/main/java/inter/impl/bean/Onion.java b/IngredientFactory/src/main/java/inter/impl/bean/Onion.java
index 365bae59b50a1469a2821bd2395bb55da3d407fc..cb451674e237b3f410254b14a68b467fd0aaa7aa 100644
--- a/IngredientFactory/src/main/java/inter/impl/bean/Onion.java
+++ b/IngredientFactory/src/main/java/inter/impl/bean/Onion.java
@@ -14,7 +14,7 @@ public class Onion implements Vegetable {
public Onion(String type) {
switch (type){
case "canton":
- this.name=type+"洋葱";
+ this.name=type+":洋葱";
break;
}
System.out.println("创建"+this.getName() );
diff --git a/IngredientFactory/src/main/java/inter/impl/bean/OnionShaobing.java b/IngredientFactory/src/main/java/inter/impl/bean/OnionShaobing.java
index 327619a5f64a4587c9839390b9afa70541c5f95d..151ec719af4157bbb53b7ae4559aa9d770578c11 100644
--- a/IngredientFactory/src/main/java/inter/impl/bean/OnionShaobing.java
+++ b/IngredientFactory/src/main/java/inter/impl/bean/OnionShaobing.java
@@ -13,7 +13,7 @@ import inter.impl.factory.ShaobingIngredientFactory;
public class OnionShaobing extends Shaobing {
//原材料 抽象工厂
- IngredientFactory ingredientFactory;
+ final IngredientFactory ingredientFactory;
public OnionShaobing(){
ingredientFactory = new ShaobingIngredientFactory();
diff --git a/IngredientFactory/src/main/java/inter/impl/bean/PotatoShaobing.java b/IngredientFactory/src/main/java/inter/impl/bean/PotatoShaobing.java
new file mode 100644
index 0000000000000000000000000000000000000000..c8c27b8cacdf5a561894bb9c4eef773429330b4b
--- /dev/null
+++ b/IngredientFactory/src/main/java/inter/impl/bean/PotatoShaobing.java
@@ -0,0 +1,29 @@
+package inter.impl.bean;
+
+import inter.bean.Shaobing;
+import inter.factory.IngredientFactory;
+import inter.impl.factory.ShaobingIngredientFactory;
+
+/**
+ * @program: designModel
+ * @description: 土豆烧饼
+ * @author: liuxincheng
+ * @create: 2019-04-02 09:15
+ */
+public class PotatoShaobing extends Shaobing {
+
+ //原材料 抽象工厂
+ final IngredientFactory ingredientFactory;
+
+ public PotatoShaobing(){
+ ingredientFactory = new ShaobingIngredientFactory();
+ }
+ @Override
+ public void prepare() {
+ System.out.println("土豆烧饼开始准备原材料");
+ name="土豆烧饼";
+ dough = ingredientFactory.createDough("canton");
+ sauce = ingredientFactory.createSauce("porkLiver");
+ vegetable = ingredientFactory.createVegetable("canton");
+ }
+}
diff --git a/IngredientFactory/src/main/java/inter/impl/bean/TomatoSauce.java b/IngredientFactory/src/main/java/inter/impl/bean/ShaoBingSauce.java
similarity index 46%
rename from IngredientFactory/src/main/java/inter/impl/bean/TomatoSauce.java
rename to IngredientFactory/src/main/java/inter/impl/bean/ShaoBingSauce.java
index 8338902a1c95ec0e601364ad766e71f1fab5683e..86d221a4202fd4478f9b2eb5ef82e8cde20a3f74 100644
--- a/IngredientFactory/src/main/java/inter/impl/bean/TomatoSauce.java
+++ b/IngredientFactory/src/main/java/inter/impl/bean/ShaoBingSauce.java
@@ -4,20 +4,27 @@ import inter.bean.Sauce;
/**
* @program: designModel
- * @description: 番茄酱
+ * @description: 烧饼酱
* @author: liuxincheng
* @create: 2019-04-02 09:04
*/
-public class TomatoSauce implements Sauce {
+public class ShaoBingSauce implements Sauce {
private String name = null;
- public TomatoSauce(String type) {
+
+ public ShaoBingSauce(String type) {
switch (type) {
case "tomato":
- this.name="蕃茄酱";
+ this.name = "蕃茄酱";
+ break;
+ case "potato":
+ this.name = "土豆酱";
+ break;
+ case "porkLiver":
+ this.name = "猪肝酱";
break;
}
- System.out.println("创建"+this.getName() );
+ System.out.println("创建" + this.getName());
}
@Override
diff --git a/IngredientFactory/src/main/java/inter/impl/factory/ShaobingIngredientFactory.java b/IngredientFactory/src/main/java/inter/impl/factory/ShaobingIngredientFactory.java
index 6dd4366eec66a4a64e07c2ce153088f25045c31c..2fbcc8e21f831ceb7f03ad9cc50a261d3acb5540 100644
--- a/IngredientFactory/src/main/java/inter/impl/factory/ShaobingIngredientFactory.java
+++ b/IngredientFactory/src/main/java/inter/impl/factory/ShaobingIngredientFactory.java
@@ -4,7 +4,7 @@ import inter.bean.*;
import inter.factory.IngredientFactory;
import inter.impl.bean.DBDough;
import inter.impl.bean.Onion;
-import inter.impl.bean.TomatoSauce;
+import inter.impl.bean.ShaoBingSauce;
/**
* @program: designModel
@@ -21,7 +21,7 @@ public class ShaobingIngredientFactory implements IngredientFactory {
@Override
public Sauce createSauce(String type) {
- return new TomatoSauce(type);//番茄酱
+ return new ShaoBingSauce(type);//烧饼酱
}
@Override
diff --git a/IngredientFactory/src/main/java/inter/story/impl/CSShaobingStore.java b/IngredientFactory/src/main/java/inter/story/impl/CSShaobingStore.java
index cda9c3ef36227e92dee99dc8f764191d27ad835a..acd517de061e79b8e3c09f5eac59db13462815df 100644
--- a/IngredientFactory/src/main/java/inter/story/impl/CSShaobingStore.java
+++ b/IngredientFactory/src/main/java/inter/story/impl/CSShaobingStore.java
@@ -1,7 +1,10 @@
package inter.story.impl;
+import inter.bean.Sauce;
import inter.bean.Shaobing;
import inter.impl.bean.OnionShaobing;
+import inter.impl.bean.PotatoShaobing;
+import inter.impl.bean.ShaoBingSauce;
import inter.story.ShaobingStore;
/**
@@ -18,7 +21,7 @@ public class CSShaobingStore extends ShaobingStore {
switch (type){
case "onion":
- shaobing = new OnionShaobing();
+ shaobing = new PotatoShaobing();
break;
default:
break;
diff --git a/IngredientFactory/src/test/java/TestIngredientFactory.java b/IngredientFactory/src/test/java/TestIngredientFactory.java
index 68c163d3a1a93042d2668d8f5219ac19eb538c62..08557f58242af4527785221b958b86cb492fd2b8 100644
--- a/IngredientFactory/src/test/java/TestIngredientFactory.java
+++ b/IngredientFactory/src/test/java/TestIngredientFactory.java
@@ -1,5 +1,6 @@
import inter.bean.Shaobing;
import inter.story.ShaobingStore;
+import inter.story.impl.CSShaobingStore;
import inter.story.impl.GZShaobingStore;
import org.junit.Test;
@@ -18,5 +19,12 @@ public class TestIngredientFactory {
//售出一个洋葱烧饼
Shaobing shaobing = gzStore.orderShaobing("onion");
System.out.println(shaobing.name);
+
+ System.out.println("---------------------------------");
+
+ ShaobingStore csShaobingStore = new CSShaobingStore();
+ //售出一个洋葱烧饼
+ shaobing = csShaobingStore.orderShaobing("onion");
+ System.out.println(shaobing.name);
}
}
\ No newline at end of file
diff --git a/ObserverModel/src/main/java/Subject/impl/AccountSubject.java b/ObserverModel/src/main/java/Subject/impl/AccountSubject.java
index a1b9c09b5cebee8bfae32bd8308b81034b31bc81..4fba0acd92f2d1ee5e774719f0b955c59d597555 100644
--- a/ObserverModel/src/main/java/Subject/impl/AccountSubject.java
+++ b/ObserverModel/src/main/java/Subject/impl/AccountSubject.java
@@ -16,7 +16,7 @@ import observe.Observer;
public class AccountSubject extends AbstractSubject {
//观察者集合
- public List observerList;
+ public final List observerList;
//账户资金
private Double money;
diff --git a/ProxyModel/src/main/java/inter/impl/LogInterceptor.java b/ProxyModel/src/main/java/inter/impl/LogInterceptor.java
index bcb18ce98abca1a624d2e9f31fe4ba5cc0920587..b4eb3aa9f0178dc26a16c0b8385477100b9c426d 100644
--- a/ProxyModel/src/main/java/inter/impl/LogInterceptor.java
+++ b/ProxyModel/src/main/java/inter/impl/LogInterceptor.java
@@ -11,7 +11,7 @@ import java.lang.reflect.Method;
* @Version V1.0
**/
public class LogInterceptor implements InvocationHandler {
- private Object target;
+ private final Object target;
public LogInterceptor(Object target){
this.target=target;
diff --git a/SingletonModel/SingletonModel.iml b/SingletonModel/SingletonModel.iml
new file mode 100644
index 0000000000000000000000000000000000000000..5489c880202e4716eca28b654efafcedd7ca004f
--- /dev/null
+++ b/SingletonModel/SingletonModel.iml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/SingletonModel/src/main/java/bean/SingletonBean.java b/SingletonModel/src/main/java/bean/SingletonBean.java
index 2383f8581752303b305d28ca304f5b19b2826a0e..546692c4148e8920ecddabae1ef9168f35994d16 100644
--- a/SingletonModel/src/main/java/bean/SingletonBean.java
+++ b/SingletonModel/src/main/java/bean/SingletonBean.java
@@ -28,7 +28,7 @@ public class SingletonBean {
* @date 2019/3/27 10:34
*/
public static class SingletonClassFactory{
- private static SingletonBean singletonBean = new SingletonBean();
+ private static final SingletonBean singletonBean = new SingletonBean();
}
/***
diff --git a/SingletonModel/src/main/test/SingletonTest.java b/SingletonModel/src/main/test/SingletonTest.java
index 96bf49c95aa0d9c83f9eb8bd3dd45709b7f24fe4..211c876e915d0ad5479dc6c68048b26fb89c6b58 100644
--- a/SingletonModel/src/main/test/SingletonTest.java
+++ b/SingletonModel/src/main/test/SingletonTest.java
@@ -12,7 +12,7 @@ import java.io.PrintStream;
*/
public class SingletonTest {
- private PrintStream printStream = System.out;
+ private final PrintStream printStream = System.out;
@Test
public void test1(){
Singleton si = Singleton.getInstance();
diff --git a/StrategyModel/src/main/java/bean/enm/AnimalEnum.java b/StrategyModel/src/main/java/bean/enm/AnimalEnum.java
index 283ad4a9774639f9315f49a870bee4046e5d083d..9ae500012a8079c3c8d06e20ec0fefd3e89dc640 100644
--- a/StrategyModel/src/main/java/bean/enm/AnimalEnum.java
+++ b/StrategyModel/src/main/java/bean/enm/AnimalEnum.java
@@ -35,14 +35,11 @@ public enum AnimalEnum implements Common {
}
}
;
- private String fd;
- private String name;
- private Integer weitht;
+ private final String fd;
private Integer weitht2;
private Integer weitht3;
AnimalEnum(String name, int i,String food) {
- this.name=name;
- this.weitht=i;
+ Integer weitht = i;
this.fd=food;
}
}
diff --git a/StrategyModel/src/main/java/bean/enm/Method.java b/StrategyModel/src/main/java/bean/enm/Method.java
index 6d06812964bde53b82d8c8bcd61ebf060312c2b8..763aa195e236404c0ef44917ded4f3bb54eea42d 100644
--- a/StrategyModel/src/main/java/bean/enm/Method.java
+++ b/StrategyModel/src/main/java/bean/enm/Method.java
@@ -11,7 +11,7 @@ public enum Method {
Get("get"),
Post("post");
- private String value;
+ private final String value;
Method(String value){
this.value=value;
diff --git a/StrategyModel/src/main/java/bean/enm/NotifyType.java b/StrategyModel/src/main/java/bean/enm/NotifyType.java
index 421c7a3fddc47efd549a5eadef0b6fe9fedd3a77..8c31b1f7f851b93912b0be3a0b397e0e15e9038f 100644
--- a/StrategyModel/src/main/java/bean/enm/NotifyType.java
+++ b/StrategyModel/src/main/java/bean/enm/NotifyType.java
@@ -14,8 +14,8 @@ public enum NotifyType {
SMS("短信", NotifyMechanismInterface.bySms()),
WECHAT("微信", NotifyMechanismInterface.byWeChat());
- private String desc;
- private NotifyMechanismInterface notifyMechanism;
+ private final String desc;
+ private final NotifyMechanismInterface notifyMechanism;
NotifyType(String desc, NotifyMechanismInterface notifyMechanism) {
this.desc = desc;
diff --git a/StrategyModel/src/test/java/StrategyClient.java b/StrategyModel/src/test/java/StrategyClient.java
index 23fa67582141a2930ea35e41e49c6ad2458a1d40..4a76c45bf7cff33136863519178d38c64b453fb4 100644
--- a/StrategyModel/src/test/java/StrategyClient.java
+++ b/StrategyModel/src/test/java/StrategyClient.java
@@ -96,6 +96,7 @@ public class StrategyClient {
System.out.println(x+" "+y);
System.out.printf("%s\n",x==y);
+ System.out.printf("%s\n%s",x,y);
}
@Test