From dd6946585f5212c1bc6461360496e436c24c2a0c Mon Sep 17 00:00:00 2001 From: Diane Duan Date: Mon, 14 Nov 2016 14:53:12 +0800 Subject: [PATCH 1/6] core-java Properties class demos --- .../baeldung/properties/DefaultListDemo.java | 23 ++++++++ .../com/baeldung/properties/LoadDemo.java | 26 +++++++++ .../baeldung/properties/OperationsDemo.java | 57 +++++++++++++++++++ .../com/baeldung/properties/StoreDemo.java | 30 ++++++++++ core-java/src/main/resources/app.properties | 3 + core-java/src/main/resources/catalog | 3 + .../src/main/resources/default.properties | 4 ++ core-java/src/main/resources/icons.xml | 8 +++ 8 files changed, 154 insertions(+) create mode 100644 core-java/src/main/java/com/baeldung/properties/DefaultListDemo.java create mode 100644 core-java/src/main/java/com/baeldung/properties/LoadDemo.java create mode 100644 core-java/src/main/java/com/baeldung/properties/OperationsDemo.java create mode 100644 core-java/src/main/java/com/baeldung/properties/StoreDemo.java create mode 100644 core-java/src/main/resources/app.properties create mode 100644 core-java/src/main/resources/catalog create mode 100644 core-java/src/main/resources/default.properties create mode 100644 core-java/src/main/resources/icons.xml diff --git a/core-java/src/main/java/com/baeldung/properties/DefaultListDemo.java b/core-java/src/main/java/com/baeldung/properties/DefaultListDemo.java new file mode 100644 index 0000000000..758bd2a71b --- /dev/null +++ b/core-java/src/main/java/com/baeldung/properties/DefaultListDemo.java @@ -0,0 +1,23 @@ +package com.baeldung.properties; + +import java.io.FileInputStream; +import java.io.IOException; +import java.util.Properties; + +public class DefaultListDemo { + public static void main(String[] args) throws IOException { + String rootPath = Thread.currentThread().getContextClassLoader().getResource("").getPath(); + String defaultConfigPath = rootPath + "default.properties"; + String appConfigPath = rootPath + "app.properties"; + + Properties defaultProps = new Properties(); + defaultProps.load(new FileInputStream(defaultConfigPath)); + + Properties appProps = new Properties(defaultProps); + appProps.load(new FileInputStream(appConfigPath)); + + System.out.println(appProps.getProperty("name")); + System.out.println(appProps.getProperty("version")); + System.out.println(appProps.getProperty("site")); + } +} diff --git a/core-java/src/main/java/com/baeldung/properties/LoadDemo.java b/core-java/src/main/java/com/baeldung/properties/LoadDemo.java new file mode 100644 index 0000000000..3a75113b79 --- /dev/null +++ b/core-java/src/main/java/com/baeldung/properties/LoadDemo.java @@ -0,0 +1,26 @@ +package com.baeldung.properties; + +import java.io.FileInputStream; +import java.io.IOException; +import java.util.Properties; + +public class LoadDemo { + public static void main(String[] args) throws IOException { + String rootPath = Thread.currentThread().getContextClassLoader().getResource("").getPath(); + String appConfigPath = rootPath + "app.properties"; + String catalogConfigPath = rootPath + "catalog"; + String iconConfigPath = rootPath + "icons.xml"; + + // load from properties file which use .properties as the suffix + Properties appProps = new Properties(); + appProps.load(new FileInputStream(appConfigPath)); + + // load from properties file which not use .properties as the suffix + Properties catalogProps = new Properties(); + catalogProps.load(new FileInputStream(catalogConfigPath)); + + // load from XML file + Properties iconProps = new Properties(); + iconProps.loadFromXML(new FileInputStream(iconConfigPath)); + } +} diff --git a/core-java/src/main/java/com/baeldung/properties/OperationsDemo.java b/core-java/src/main/java/com/baeldung/properties/OperationsDemo.java new file mode 100644 index 0000000000..c33caf877c --- /dev/null +++ b/core-java/src/main/java/com/baeldung/properties/OperationsDemo.java @@ -0,0 +1,57 @@ +package com.baeldung.properties; + +import java.io.FileInputStream; +import java.io.IOException; +import java.util.Enumeration; +import java.util.Properties; + +public class OperationsDemo { + public static void main(String[] args) throws IOException { + String rootPath = Thread.currentThread().getContextClassLoader().getResource("").getPath(); + String appConfigPath = rootPath + "app.properties"; + Properties appProps = new Properties(); + appProps.load(new FileInputStream(appConfigPath)); + + // retrieve values + String appVersion = appProps.getProperty("version"); + String appName = appProps.getProperty("name", "defaultName"); + String appGroup = appProps.getProperty("group", "baeldung"); + String appDownloadAddr = appProps.getProperty("downloadAddr"); + System.out.println(appVersion); + System.out.println(appName); + System.out.println(appGroup); + System.out.println(appDownloadAddr); + + // set values + appProps.setProperty("name", "NewAppName"); + appProps.setProperty("downloadAddr", "www.baeldung.com/downloads"); + appName = appProps.getProperty("name"); + appDownloadAddr = appProps.getProperty("downloadAddr"); + System.out.println("new app name: " + appName); + System.out.println("new app downloadAddr: " + appDownloadAddr); + + // remove a key-value pair + System.out.println("before removal, version is: " + appProps.getProperty("version")); + appProps.remove("version"); + System.out.println("after removal, version is: " + appProps.getProperty("version")); + + // list all key-value pairs + appProps.list(System.out); + + // get an enumeration of all values + Enumeration valueEnumeration = appProps.elements(); + while (valueEnumeration.hasMoreElements()) { + System.out.println(valueEnumeration.nextElement()); + } + + // get an enumeration of all keys + Enumeration keyEnumeration = appProps.keys(); + while (keyEnumeration.hasMoreElements()) { + System.out.println(keyEnumeration.nextElement()); + } + + // get the count of key-value pairs + int size = appProps.size(); + System.out.println(size); + } +} diff --git a/core-java/src/main/java/com/baeldung/properties/StoreDemo.java b/core-java/src/main/java/com/baeldung/properties/StoreDemo.java new file mode 100644 index 0000000000..e8a7892c40 --- /dev/null +++ b/core-java/src/main/java/com/baeldung/properties/StoreDemo.java @@ -0,0 +1,30 @@ +package com.baeldung.properties; + +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.FileWriter; +import java.io.IOException; +import java.util.Properties; + +public class StoreDemo { + public static void main(String[] args) throws IOException { + String rootPath = Thread.currentThread().getContextClassLoader().getResource("").getPath(); + String appConfigPath = rootPath + "app.properties"; + + // load the original properties + Properties appProps = new Properties(); + appProps.load(new FileInputStream(appConfigPath)); + + // update property list + appProps.setProperty("name", "NewAppName"); + appProps.setProperty("downloadAddr", "www.baeldung.com/downloads"); + + // store new property list in properties file + String newAppConfigPropertiesFile = rootPath + "newApp.properties"; + appProps.store(new FileWriter(newAppConfigPropertiesFile), "store to properties file"); + + // store new property list in XML file + String newAppConfigXmlFile = rootPath + "newApp.xml"; + appProps.storeToXML(new FileOutputStream(newAppConfigXmlFile), "store to xml file"); + } +} diff --git a/core-java/src/main/resources/app.properties b/core-java/src/main/resources/app.properties new file mode 100644 index 0000000000..ff6174ec2a --- /dev/null +++ b/core-java/src/main/resources/app.properties @@ -0,0 +1,3 @@ +version=1.0 +name=TestApp +date=2016-11-12 \ No newline at end of file diff --git a/core-java/src/main/resources/catalog b/core-java/src/main/resources/catalog new file mode 100644 index 0000000000..488513d0ce --- /dev/null +++ b/core-java/src/main/resources/catalog @@ -0,0 +1,3 @@ +c1=files +c2=images +c3=videos \ No newline at end of file diff --git a/core-java/src/main/resources/default.properties b/core-java/src/main/resources/default.properties new file mode 100644 index 0000000000..df1bab371c --- /dev/null +++ b/core-java/src/main/resources/default.properties @@ -0,0 +1,4 @@ +site=www.google.com +name=DefaultAppName +topic=Properties +category=core-java \ No newline at end of file diff --git a/core-java/src/main/resources/icons.xml b/core-java/src/main/resources/icons.xml new file mode 100644 index 0000000000..0db7b2699a --- /dev/null +++ b/core-java/src/main/resources/icons.xml @@ -0,0 +1,8 @@ + + + + xml example + icon1.jpg + icon2.jpg + icon3.jpg + \ No newline at end of file From d2e52b4368c49d4072daed7d32157adecc5f4faa Mon Sep 17 00:00:00 2001 From: Diane Duan Date: Tue, 15 Nov 2016 12:37:17 +0800 Subject: [PATCH 2/6] add unit tests --- .../baeldung/properties/OperationsDemo.java | 57 ----------- .../com/baeldung/properties/StoreDemo.java | 30 ------ .../PropertiesDefaultListTest.java} | 17 +++- .../properties/PropertiesLoadTest.java} | 14 ++- .../properties/PropertiesOperationsTest.java | 97 +++++++++++++++++++ .../properties/PropertiesStoreTest.java | 51 ++++++++++ .../{main => test}/resources/app.properties | 0 .../src/{main => test}/resources/catalog | 0 .../resources/default.properties | 0 .../src/{main => test}/resources/icons.xml | 0 10 files changed, 170 insertions(+), 96 deletions(-) delete mode 100644 core-java/src/main/java/com/baeldung/properties/OperationsDemo.java delete mode 100644 core-java/src/main/java/com/baeldung/properties/StoreDemo.java rename core-java/src/{main/java/com/baeldung/properties/DefaultListDemo.java => test/java/com/baeldung/properties/PropertiesDefaultListTest.java} (55%) rename core-java/src/{main/java/com/baeldung/properties/LoadDemo.java => test/java/com/baeldung/properties/PropertiesLoadTest.java} (74%) create mode 100644 core-java/src/test/java/com/baeldung/properties/PropertiesOperationsTest.java create mode 100644 core-java/src/test/java/com/baeldung/properties/PropertiesStoreTest.java rename core-java/src/{main => test}/resources/app.properties (100%) rename core-java/src/{main => test}/resources/catalog (100%) rename core-java/src/{main => test}/resources/default.properties (100%) rename core-java/src/{main => test}/resources/icons.xml (100%) diff --git a/core-java/src/main/java/com/baeldung/properties/OperationsDemo.java b/core-java/src/main/java/com/baeldung/properties/OperationsDemo.java deleted file mode 100644 index c33caf877c..0000000000 --- a/core-java/src/main/java/com/baeldung/properties/OperationsDemo.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.baeldung.properties; - -import java.io.FileInputStream; -import java.io.IOException; -import java.util.Enumeration; -import java.util.Properties; - -public class OperationsDemo { - public static void main(String[] args) throws IOException { - String rootPath = Thread.currentThread().getContextClassLoader().getResource("").getPath(); - String appConfigPath = rootPath + "app.properties"; - Properties appProps = new Properties(); - appProps.load(new FileInputStream(appConfigPath)); - - // retrieve values - String appVersion = appProps.getProperty("version"); - String appName = appProps.getProperty("name", "defaultName"); - String appGroup = appProps.getProperty("group", "baeldung"); - String appDownloadAddr = appProps.getProperty("downloadAddr"); - System.out.println(appVersion); - System.out.println(appName); - System.out.println(appGroup); - System.out.println(appDownloadAddr); - - // set values - appProps.setProperty("name", "NewAppName"); - appProps.setProperty("downloadAddr", "www.baeldung.com/downloads"); - appName = appProps.getProperty("name"); - appDownloadAddr = appProps.getProperty("downloadAddr"); - System.out.println("new app name: " + appName); - System.out.println("new app downloadAddr: " + appDownloadAddr); - - // remove a key-value pair - System.out.println("before removal, version is: " + appProps.getProperty("version")); - appProps.remove("version"); - System.out.println("after removal, version is: " + appProps.getProperty("version")); - - // list all key-value pairs - appProps.list(System.out); - - // get an enumeration of all values - Enumeration valueEnumeration = appProps.elements(); - while (valueEnumeration.hasMoreElements()) { - System.out.println(valueEnumeration.nextElement()); - } - - // get an enumeration of all keys - Enumeration keyEnumeration = appProps.keys(); - while (keyEnumeration.hasMoreElements()) { - System.out.println(keyEnumeration.nextElement()); - } - - // get the count of key-value pairs - int size = appProps.size(); - System.out.println(size); - } -} diff --git a/core-java/src/main/java/com/baeldung/properties/StoreDemo.java b/core-java/src/main/java/com/baeldung/properties/StoreDemo.java deleted file mode 100644 index e8a7892c40..0000000000 --- a/core-java/src/main/java/com/baeldung/properties/StoreDemo.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.baeldung.properties; - -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.FileWriter; -import java.io.IOException; -import java.util.Properties; - -public class StoreDemo { - public static void main(String[] args) throws IOException { - String rootPath = Thread.currentThread().getContextClassLoader().getResource("").getPath(); - String appConfigPath = rootPath + "app.properties"; - - // load the original properties - Properties appProps = new Properties(); - appProps.load(new FileInputStream(appConfigPath)); - - // update property list - appProps.setProperty("name", "NewAppName"); - appProps.setProperty("downloadAddr", "www.baeldung.com/downloads"); - - // store new property list in properties file - String newAppConfigPropertiesFile = rootPath + "newApp.properties"; - appProps.store(new FileWriter(newAppConfigPropertiesFile), "store to properties file"); - - // store new property list in XML file - String newAppConfigXmlFile = rootPath + "newApp.xml"; - appProps.storeToXML(new FileOutputStream(newAppConfigXmlFile), "store to xml file"); - } -} diff --git a/core-java/src/main/java/com/baeldung/properties/DefaultListDemo.java b/core-java/src/test/java/com/baeldung/properties/PropertiesDefaultListTest.java similarity index 55% rename from core-java/src/main/java/com/baeldung/properties/DefaultListDemo.java rename to core-java/src/test/java/com/baeldung/properties/PropertiesDefaultListTest.java index 758bd2a71b..704bb19759 100644 --- a/core-java/src/main/java/com/baeldung/properties/DefaultListDemo.java +++ b/core-java/src/test/java/com/baeldung/properties/PropertiesDefaultListTest.java @@ -1,11 +1,18 @@ package com.baeldung.properties; +import org.junit.Test; + import java.io.FileInputStream; +import java.io.FileNotFoundException; import java.io.IOException; import java.util.Properties; -public class DefaultListDemo { - public static void main(String[] args) throws IOException { +import static org.hamcrest.core.IsEqual.equalTo; +import static org.junit.Assert.assertThat; + +public class PropertiesDefaultListTest { + @Test + public void testDefaultList() throws IOException { String rootPath = Thread.currentThread().getContextClassLoader().getResource("").getPath(); String defaultConfigPath = rootPath + "default.properties"; String appConfigPath = rootPath + "app.properties"; @@ -16,8 +23,8 @@ public class DefaultListDemo { Properties appProps = new Properties(defaultProps); appProps.load(new FileInputStream(appConfigPath)); - System.out.println(appProps.getProperty("name")); - System.out.println(appProps.getProperty("version")); - System.out.println(appProps.getProperty("site")); + assertThat(appProps.getProperty("name"), equalTo("TestApp")); + assertThat(appProps.getProperty("version"), equalTo("1.0")); + assertThat(appProps.getProperty("site"), equalTo("www.google.com")); } } diff --git a/core-java/src/main/java/com/baeldung/properties/LoadDemo.java b/core-java/src/test/java/com/baeldung/properties/PropertiesLoadTest.java similarity index 74% rename from core-java/src/main/java/com/baeldung/properties/LoadDemo.java rename to core-java/src/test/java/com/baeldung/properties/PropertiesLoadTest.java index 3a75113b79..bcf386bd0f 100644 --- a/core-java/src/main/java/com/baeldung/properties/LoadDemo.java +++ b/core-java/src/test/java/com/baeldung/properties/PropertiesLoadTest.java @@ -1,15 +1,17 @@ package com.baeldung.properties; +import org.junit.Test; + import java.io.FileInputStream; import java.io.IOException; import java.util.Properties; -public class LoadDemo { - public static void main(String[] args) throws IOException { +public class PropertiesLoadTest { + @Test + public void testLoadFromPropertiesFiles() throws IOException { String rootPath = Thread.currentThread().getContextClassLoader().getResource("").getPath(); String appConfigPath = rootPath + "app.properties"; String catalogConfigPath = rootPath + "catalog"; - String iconConfigPath = rootPath + "icons.xml"; // load from properties file which use .properties as the suffix Properties appProps = new Properties(); @@ -18,8 +20,12 @@ public class LoadDemo { // load from properties file which not use .properties as the suffix Properties catalogProps = new Properties(); catalogProps.load(new FileInputStream(catalogConfigPath)); + } - // load from XML file + @Test + public void testLoadFromXmlFile() throws IOException { + String rootPath = Thread.currentThread().getContextClassLoader().getResource("").getPath(); + String iconConfigPath = rootPath + "icons.xml"; Properties iconProps = new Properties(); iconProps.loadFromXML(new FileInputStream(iconConfigPath)); } diff --git a/core-java/src/test/java/com/baeldung/properties/PropertiesOperationsTest.java b/core-java/src/test/java/com/baeldung/properties/PropertiesOperationsTest.java new file mode 100644 index 0000000000..20aa64c385 --- /dev/null +++ b/core-java/src/test/java/com/baeldung/properties/PropertiesOperationsTest.java @@ -0,0 +1,97 @@ +package com.baeldung.properties; + +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; +import org.junit.Before; +import org.junit.Test; +import org.testng.annotations.BeforeClass; + +import java.io.FileInputStream; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Enumeration; +import java.util.List; +import java.util.Properties; +import java.util.Set; + +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.core.IsEqual.equalTo; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; + +public class PropertiesOperationsTest { + private Properties appProps; + + @Before + public void beforeClass() throws IOException { + String rootPath = Thread.currentThread().getContextClassLoader().getResource("").getPath(); + String appConfigPath = rootPath + "app.properties"; + appProps = new Properties(); + appProps.load(new FileInputStream(appConfigPath)); + } + + @Test + public void testGetProperties() { + String appVersion = appProps.getProperty("version"); + String appName = appProps.getProperty("name", "defaultName"); + String appGroup = appProps.getProperty("group", "baeldung"); + String appDownloadAddr = appProps.getProperty("downloadAddr"); + + assertThat(appVersion, equalTo("1.0")); + assertThat(appName, equalTo("TestApp")); + assertThat(appGroup, equalTo("baeldung")); + assertThat(appDownloadAddr, equalTo(null)); + } + + @Test + public void testSetProperties() { + appProps.setProperty("name", "NewAppName"); + appProps.setProperty("downloadAddr", "www.baeldung.com/downloads"); + + String appName = appProps.getProperty("name"); + String appDownloadAddr = appProps.getProperty("downloadAddr"); + + assertThat(appName, equalTo("NewAppName")); + assertThat(appDownloadAddr, equalTo("www.baeldung.com/downloads")); + } + + @Test + public void testRemoveProperties() { + String versionBeforeRemoval = appProps.getProperty("version"); + assertThat(versionBeforeRemoval, equalTo("1.0")); + + appProps.remove("version"); + + String versionAfterRemoval = appProps.getProperty("version"); + assertThat(versionAfterRemoval, equalTo(null)); + } + + @Test + public void testGetEnumerationOfValues() { + Enumeration valueEnumeration = appProps.elements(); + List values = Lists.newArrayList(); + while (valueEnumeration.hasMoreElements()) { + String val = String.valueOf(valueEnumeration.nextElement()); + values.add(val); + } + assertArrayEquals(new String[] {"1.0", "2016-11-12", "TestApp"}, values.toArray()); + } + + @Test + public void testGetEnumerationOfKeys() { + Enumeration keyEnumeration = appProps.keys(); + List keys = Lists.newArrayList(); + while (keyEnumeration.hasMoreElements()) { + String key = String.valueOf(keyEnumeration.nextElement()); + keys.add(key); + } + assertArrayEquals(new String[] {"version", "date", "name"}, keys.toArray()); + } + + @Test + public void testGetSize() { + int size = appProps.size(); + assertThat(size, equalTo(3)); + } +} diff --git a/core-java/src/test/java/com/baeldung/properties/PropertiesStoreTest.java b/core-java/src/test/java/com/baeldung/properties/PropertiesStoreTest.java new file mode 100644 index 0000000000..582fdb3808 --- /dev/null +++ b/core-java/src/test/java/com/baeldung/properties/PropertiesStoreTest.java @@ -0,0 +1,51 @@ +package com.baeldung.properties; + +import org.junit.Before; +import org.junit.Test; +import org.testng.annotations.BeforeClass; + +import java.io.*; +import java.util.Properties; + +import static org.hamcrest.core.IsEqual.equalTo; +import static org.junit.Assert.assertThat; + +public class PropertiesStoreTest { + private static Properties appProps = new Properties(); + + @Before + public void before() throws IOException { + String rootPath = Thread.currentThread().getContextClassLoader().getResource("").getPath(); + String appConfigPath = rootPath + "app.properties"; + + // load the original properties + appProps.load(new FileInputStream(appConfigPath)); + + // update property list + appProps.setProperty("name", "NewAppName"); + appProps.setProperty("downloadAddr", "www.baeldung.com/downloads"); + } + + @Test + public void testStoreToPropertiesFile() throws IOException { + String rootPath = Thread.currentThread().getContextClassLoader().getResource("").getPath(); + String newAppConfigPropertiesFile = rootPath + "newApp.properties"; + appProps.store(new FileWriter(newAppConfigPropertiesFile), "store to properties file"); + + + Properties verifyProps = new Properties(); + verifyProps.load(new FileInputStream(newAppConfigPropertiesFile)); + assertThat(verifyProps.getProperty("name"), equalTo("NewAppName")); + } + + @Test + public void testStoreToXmlFile() throws IOException { + String rootPath = Thread.currentThread().getContextClassLoader().getResource("").getPath(); + String newAppConfigXmlFile = rootPath + "newApp.xml"; + appProps.storeToXML(new FileOutputStream(newAppConfigXmlFile), "store to xml file"); + + Properties verifyProps = new Properties(); + verifyProps.loadFromXML(new FileInputStream(newAppConfigXmlFile)); + assertThat(verifyProps.getProperty("downloadAddr"), equalTo("www.baeldung.com/downloads")); + } +} diff --git a/core-java/src/main/resources/app.properties b/core-java/src/test/resources/app.properties similarity index 100% rename from core-java/src/main/resources/app.properties rename to core-java/src/test/resources/app.properties diff --git a/core-java/src/main/resources/catalog b/core-java/src/test/resources/catalog similarity index 100% rename from core-java/src/main/resources/catalog rename to core-java/src/test/resources/catalog diff --git a/core-java/src/main/resources/default.properties b/core-java/src/test/resources/default.properties similarity index 100% rename from core-java/src/main/resources/default.properties rename to core-java/src/test/resources/default.properties diff --git a/core-java/src/main/resources/icons.xml b/core-java/src/test/resources/icons.xml similarity index 100% rename from core-java/src/main/resources/icons.xml rename to core-java/src/test/resources/icons.xml From 42fc383518761be292e36041cc3d0f81f27ed7b2 Mon Sep 17 00:00:00 2001 From: DianeDuan Date: Sun, 20 Nov 2016 10:52:09 +0800 Subject: [PATCH 3/6] FactoryBean example code --- .../factorybean/FactoryBeanAppConfig.java | 25 +++++++ .../InitializationToolFactory.java | 68 ++++++++++++++++++ .../factorybean/NonSingleToolFactory.java | 56 +++++++++++++++ .../factorybean/PostConstructToolFactory.java | 69 +++++++++++++++++++ .../factorybean/SingleToolFactory.java | 53 ++++++++++++++ .../java/com/baeldung/factorybean/Tool.java | 40 +++++++++++ .../com/baeldung/factorybean/ToolFactory.java | 57 +++++++++++++++ .../java/com/baeldung/factorybean/Worker.java | 30 ++++++++ .../factorybean-abstract-spring-ctx.xml | 39 +++++++++++ .../resources/factorybean-init-spring-ctx.xml | 17 +++++ .../factorybean-postconstruct-spring-ctx.xml | 20 ++++++ .../main/resources/factorybean-spring-ctx.xml | 17 +++++ .../factorybean/AbstractFactoryBeanTest.java | 35 ++++++++++ .../FactoryBeanInitializeTest.java | 17 +++++ .../baeldung/factorybean/FactoryBeanTest.java | 39 +++++++++++ 15 files changed, 582 insertions(+) create mode 100644 spring-core/src/main/java/com/baeldung/factorybean/FactoryBeanAppConfig.java create mode 100644 spring-core/src/main/java/com/baeldung/factorybean/InitializationToolFactory.java create mode 100644 spring-core/src/main/java/com/baeldung/factorybean/NonSingleToolFactory.java create mode 100644 spring-core/src/main/java/com/baeldung/factorybean/PostConstructToolFactory.java create mode 100644 spring-core/src/main/java/com/baeldung/factorybean/SingleToolFactory.java create mode 100644 spring-core/src/main/java/com/baeldung/factorybean/Tool.java create mode 100644 spring-core/src/main/java/com/baeldung/factorybean/ToolFactory.java create mode 100644 spring-core/src/main/java/com/baeldung/factorybean/Worker.java create mode 100644 spring-core/src/main/resources/factorybean-abstract-spring-ctx.xml create mode 100644 spring-core/src/main/resources/factorybean-init-spring-ctx.xml create mode 100644 spring-core/src/main/resources/factorybean-postconstruct-spring-ctx.xml create mode 100644 spring-core/src/main/resources/factorybean-spring-ctx.xml create mode 100644 spring-core/src/test/java/com/baeldung/factorybean/AbstractFactoryBeanTest.java create mode 100644 spring-core/src/test/java/com/baeldung/factorybean/FactoryBeanInitializeTest.java create mode 100644 spring-core/src/test/java/com/baeldung/factorybean/FactoryBeanTest.java diff --git a/spring-core/src/main/java/com/baeldung/factorybean/FactoryBeanAppConfig.java b/spring-core/src/main/java/com/baeldung/factorybean/FactoryBeanAppConfig.java new file mode 100644 index 0000000000..ab36df27cb --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/factorybean/FactoryBeanAppConfig.java @@ -0,0 +1,25 @@ +package com.baeldung.factorybean; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class FactoryBeanAppConfig { + @Bean + public ToolFactory tool() { + ToolFactory factory = new ToolFactory(); + factory.setFactoryId(7070); + factory.setToolId(2); + factory.setToolName("wrench"); + factory.setToolPrice(3.7); + return factory; + } + + @Bean + public Worker worker() throws Exception { + Worker worker = new Worker(); + worker.setNumber("1002"); + worker.setTool(tool().getObject()); + return worker; + } +} diff --git a/spring-core/src/main/java/com/baeldung/factorybean/InitializationToolFactory.java b/spring-core/src/main/java/com/baeldung/factorybean/InitializationToolFactory.java new file mode 100644 index 0000000000..925ba2d8e4 --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/factorybean/InitializationToolFactory.java @@ -0,0 +1,68 @@ +package com.baeldung.factorybean; + +import org.springframework.beans.factory.FactoryBean; +import org.springframework.beans.factory.InitializingBean; + +public class InitializationToolFactory implements FactoryBean, InitializingBean { + private int factoryId;// standard setters and getters + private int toolId;// standard setters and getters + private String toolName;// standard setters and getters + private double toolPrice;// standard setters and getters + + @Override + public void afterPropertiesSet() throws Exception { + if (toolName == null || toolName.equals("")) { + throw new IllegalArgumentException("tool name cannot be empty"); + } + if (toolPrice < 0) { + throw new IllegalArgumentException("tool price should not be less than 0"); + } + } + + @Override + public Tool getObject() throws Exception { + return new Tool(toolId, toolName, toolPrice); + } + + @Override + public Class getObjectType() { + return Tool.class; + } + + @Override + public boolean isSingleton() { + return false; + } + + public int getFactoryId() { + return factoryId; + } + + public void setFactoryId(int factoryId) { + this.factoryId = factoryId; + } + + public int getToolId() { + return toolId; + } + + public void setToolId(int toolId) { + this.toolId = toolId; + } + + public String getToolName() { + return toolName; + } + + public void setToolName(String toolName) { + this.toolName = toolName; + } + + public double getToolPrice() { + return toolPrice; + } + + public void setToolPrice(double toolPrice) { + this.toolPrice = toolPrice; + } +} diff --git a/spring-core/src/main/java/com/baeldung/factorybean/NonSingleToolFactory.java b/spring-core/src/main/java/com/baeldung/factorybean/NonSingleToolFactory.java new file mode 100644 index 0000000000..0cd80eab41 --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/factorybean/NonSingleToolFactory.java @@ -0,0 +1,56 @@ +package com.baeldung.factorybean; + +import org.springframework.beans.factory.config.AbstractFactoryBean; + +public class NonSingleToolFactory extends AbstractFactoryBean { + private int factoryId;// standard setters and getters + private int toolId;// standard setters and getters + private String toolName;// standard setters and getters + private double toolPrice;// standard setters and getters + + public NonSingleToolFactory() { + setSingleton(false); + } + + @Override + public Class getObjectType() { + return Tool.class; + } + + @Override + protected Tool createInstance() throws Exception { + return new Tool(toolId, toolName, toolPrice); + } + + public int getFactoryId() { + return factoryId; + } + + public void setFactoryId(int factoryId) { + this.factoryId = factoryId; + } + + public int getToolId() { + return toolId; + } + + public void setToolId(int toolId) { + this.toolId = toolId; + } + + public String getToolName() { + return toolName; + } + + public void setToolName(String toolName) { + this.toolName = toolName; + } + + public double getToolPrice() { + return toolPrice; + } + + public void setToolPrice(double toolPrice) { + this.toolPrice = toolPrice; + } +} diff --git a/spring-core/src/main/java/com/baeldung/factorybean/PostConstructToolFactory.java b/spring-core/src/main/java/com/baeldung/factorybean/PostConstructToolFactory.java new file mode 100644 index 0000000000..8298f6f4db --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/factorybean/PostConstructToolFactory.java @@ -0,0 +1,69 @@ +package com.baeldung.factorybean; + +import javax.annotation.PostConstruct; + +import org.springframework.beans.factory.FactoryBean; + +public class PostConstructToolFactory implements FactoryBean { + private int factoryId;// standard setters and getters + private int toolId;// standard setters and getters + private String toolName;// standard setters and getters + private double toolPrice;// standard setters and getters + + @Override + public Tool getObject() throws Exception { + return new Tool(toolId, toolName, toolPrice); + } + + @Override + public Class getObjectType() { + return Tool.class; + } + + @Override + public boolean isSingleton() { + return false; + } + + @PostConstruct + public void checkParams() { + if (toolName == null || toolName.equals("")) { + throw new IllegalArgumentException("tool name cannot be empty"); + } + if (toolPrice < 0) { + throw new IllegalArgumentException("tool price should not be less than 0"); + } + } + + public int getFactoryId() { + return factoryId; + } + + public void setFactoryId(int factoryId) { + this.factoryId = factoryId; + } + + public int getToolId() { + return toolId; + } + + public void setToolId(int toolId) { + this.toolId = toolId; + } + + public String getToolName() { + return toolName; + } + + public void setToolName(String toolName) { + this.toolName = toolName; + } + + public double getToolPrice() { + return toolPrice; + } + + public void setToolPrice(double toolPrice) { + this.toolPrice = toolPrice; + } +} diff --git a/spring-core/src/main/java/com/baeldung/factorybean/SingleToolFactory.java b/spring-core/src/main/java/com/baeldung/factorybean/SingleToolFactory.java new file mode 100644 index 0000000000..94d68ef113 --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/factorybean/SingleToolFactory.java @@ -0,0 +1,53 @@ +package com.baeldung.factorybean; + +import org.springframework.beans.factory.config.AbstractFactoryBean; + +//no need to set singleton property because default value is true +public class SingleToolFactory extends AbstractFactoryBean { + private int factoryId;// standard setters and getters + private int toolId;// standard setters and getters + private String toolName;// standard setters and getters + private double toolPrice;// standard setters and getters + + @Override + public Class getObjectType() { + return Tool.class; + } + + @Override + protected Tool createInstance() throws Exception { + return new Tool(toolId, toolName, toolPrice); + } + + public int getFactoryId() { + return factoryId; + } + + public void setFactoryId(int factoryId) { + this.factoryId = factoryId; + } + + public int getToolId() { + return toolId; + } + + public void setToolId(int toolId) { + this.toolId = toolId; + } + + public String getToolName() { + return toolName; + } + + public void setToolName(String toolName) { + this.toolName = toolName; + } + + public double getToolPrice() { + return toolPrice; + } + + public void setToolPrice(double toolPrice) { + this.toolPrice = toolPrice; + } +} diff --git a/spring-core/src/main/java/com/baeldung/factorybean/Tool.java b/spring-core/src/main/java/com/baeldung/factorybean/Tool.java new file mode 100644 index 0000000000..abdd074e9a --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/factorybean/Tool.java @@ -0,0 +1,40 @@ +package com.baeldung.factorybean; + +public class Tool { + private int id;// standard setters and getters + private String name;// standard setters and getters + private double price;// standard setters and getters + + public Tool() { + } + + public Tool(int id, String name, double price) { + this.id = id; + this.name = name; + this.price = price; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public double getPrice() { + return price; + } + + public void setPrice(double price) { + this.price = price; + } +} diff --git a/spring-core/src/main/java/com/baeldung/factorybean/ToolFactory.java b/spring-core/src/main/java/com/baeldung/factorybean/ToolFactory.java new file mode 100644 index 0000000000..9b2f7fa42e --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/factorybean/ToolFactory.java @@ -0,0 +1,57 @@ +package com.baeldung.factorybean; + +import org.springframework.beans.factory.FactoryBean; + +public class ToolFactory implements FactoryBean { + private int factoryId;// standard setters and getters + private int toolId;// standard setters and getters + private String toolName;// standard setters and getters + private double toolPrice;// standard setters and getters + + @Override + public Tool getObject() throws Exception { + return new Tool(toolId, toolName, toolPrice); + } + + @Override + public Class getObjectType() { + return Tool.class; + } + + @Override + public boolean isSingleton() { + return false; + } + + public int getFactoryId() { + return factoryId; + } + + public void setFactoryId(int factoryId) { + this.factoryId = factoryId; + } + + public int getToolId() { + return toolId; + } + + public void setToolId(int toolId) { + this.toolId = toolId; + } + + public String getToolName() { + return toolName; + } + + public void setToolName(String toolName) { + this.toolName = toolName; + } + + public double getToolPrice() { + return toolPrice; + } + + public void setToolPrice(double toolPrice) { + this.toolPrice = toolPrice; + } +} diff --git a/spring-core/src/main/java/com/baeldung/factorybean/Worker.java b/spring-core/src/main/java/com/baeldung/factorybean/Worker.java new file mode 100644 index 0000000000..070322a5f9 --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/factorybean/Worker.java @@ -0,0 +1,30 @@ +package com.baeldung.factorybean; + +public class Worker { + private String number;// standard setters and getters + private Tool tool;// standard setters and getters + + public Worker() { + } + + public Worker(String number, Tool tool) { + this.number = number; + this.tool = tool; + } + + public String getNumber() { + return number; + } + + public void setNumber(String number) { + this.number = number; + } + + public Tool getTool() { + return tool; + } + + public void setTool(Tool tool) { + this.tool = tool; + } +} diff --git a/spring-core/src/main/resources/factorybean-abstract-spring-ctx.xml b/spring-core/src/main/resources/factorybean-abstract-spring-ctx.xml new file mode 100644 index 0000000000..2f34e2e1cf --- /dev/null +++ b/spring-core/src/main/resources/factorybean-abstract-spring-ctx.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/spring-core/src/main/resources/factorybean-init-spring-ctx.xml b/spring-core/src/main/resources/factorybean-init-spring-ctx.xml new file mode 100644 index 0000000000..f5835c1e70 --- /dev/null +++ b/spring-core/src/main/resources/factorybean-init-spring-ctx.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/spring-core/src/main/resources/factorybean-postconstruct-spring-ctx.xml b/spring-core/src/main/resources/factorybean-postconstruct-spring-ctx.xml new file mode 100644 index 0000000000..81e02a0b35 --- /dev/null +++ b/spring-core/src/main/resources/factorybean-postconstruct-spring-ctx.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/spring-core/src/main/resources/factorybean-spring-ctx.xml b/spring-core/src/main/resources/factorybean-spring-ctx.xml new file mode 100644 index 0000000000..800e489ba0 --- /dev/null +++ b/spring-core/src/main/resources/factorybean-spring-ctx.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/spring-core/src/test/java/com/baeldung/factorybean/AbstractFactoryBeanTest.java b/spring-core/src/test/java/com/baeldung/factorybean/AbstractFactoryBeanTest.java new file mode 100644 index 0000000000..790107f114 --- /dev/null +++ b/spring-core/src/test/java/com/baeldung/factorybean/AbstractFactoryBeanTest.java @@ -0,0 +1,35 @@ +package com.baeldung.factorybean; + +import static org.hamcrest.core.IsEqual.equalTo; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; + +import org.junit.Test; +import org.springframework.context.ApplicationContext; +import org.springframework.context.support.ClassPathXmlApplicationContext; + +public class AbstractFactoryBeanTest { + @Test + public void testSingleToolFactory() { + ApplicationContext context = new ClassPathXmlApplicationContext("classpath:factorybean-abstract-spring-ctx.xml"); + + Worker worker1 = (Worker) context.getBean("worker1"); + Worker worker2 = (Worker) context.getBean("worker2"); + + assertThat(worker1.getNumber(), equalTo("50001")); + assertThat(worker2.getNumber(), equalTo("50002")); + assertTrue(worker1.getTool() == worker2.getTool()); + } + + @Test + public void testNonSingleToolFactory() { + ApplicationContext context = new ClassPathXmlApplicationContext("classpath:factorybean-abstract-spring-ctx.xml"); + + Worker worker3 = (Worker) context.getBean("worker3"); + Worker worker4 = (Worker) context.getBean("worker4"); + + assertThat(worker3.getNumber(), equalTo("50003")); + assertThat(worker4.getNumber(), equalTo("50004")); + assertTrue(worker3.getTool() != worker4.getTool()); + } +} diff --git a/spring-core/src/test/java/com/baeldung/factorybean/FactoryBeanInitializeTest.java b/spring-core/src/test/java/com/baeldung/factorybean/FactoryBeanInitializeTest.java new file mode 100644 index 0000000000..851c15a3ec --- /dev/null +++ b/spring-core/src/test/java/com/baeldung/factorybean/FactoryBeanInitializeTest.java @@ -0,0 +1,17 @@ +package com.baeldung.factorybean; + +import org.junit.Test; +import org.springframework.context.ApplicationContext; +import org.springframework.context.support.ClassPathXmlApplicationContext; + +public class FactoryBeanInitializeTest { + @Test(expected = Exception.class) + public void testInitializationToolFactory() { + ApplicationContext context = new ClassPathXmlApplicationContext("classpath:factorybean-init-spring-ctx.xml"); + } + + @Test(expected = Exception.class) + public void testPostConstructToolFactory() { + ApplicationContext context = new ClassPathXmlApplicationContext("classpath:factorybean-postconstruct-spring-ctx.xml"); + } +} diff --git a/spring-core/src/test/java/com/baeldung/factorybean/FactoryBeanTest.java b/spring-core/src/test/java/com/baeldung/factorybean/FactoryBeanTest.java new file mode 100644 index 0000000000..d06448b63c --- /dev/null +++ b/spring-core/src/test/java/com/baeldung/factorybean/FactoryBeanTest.java @@ -0,0 +1,39 @@ +package com.baeldung.factorybean; + +import static org.hamcrest.core.IsEqual.equalTo; +import static org.junit.Assert.assertThat; + +import org.junit.Test; +import org.springframework.context.ApplicationContext; +import org.springframework.context.annotation.AnnotationConfigApplicationContext; +import org.springframework.context.support.ClassPathXmlApplicationContext; + +public class FactoryBeanTest { + @Test + public void testConstructWorkerByXml() { + ApplicationContext context = new ClassPathXmlApplicationContext("classpath:factorybean-spring-ctx.xml"); + + Worker worker = (Worker) context.getBean("worker"); + assertThat(worker.getNumber(), equalTo("1001")); + assertThat(worker.getTool().getId(), equalTo(1)); + assertThat(worker.getTool().getName(), equalTo("screwdriver")); + assertThat(worker.getTool().getPrice(), equalTo(1.5)); + + ToolFactory toolFactory = (ToolFactory) context.getBean("&tool"); + assertThat(toolFactory.getFactoryId(), equalTo(9090)); + } + + @Test + public void testConstructWorkerByJava() { + ApplicationContext context = new AnnotationConfigApplicationContext(FactoryBeanAppConfig.class); + + Worker worker = (Worker) context.getBean("worker"); + assertThat(worker.getNumber(), equalTo("1002")); + assertThat(worker.getTool().getId(), equalTo(2)); + assertThat(worker.getTool().getName(), equalTo("wrench")); + assertThat(worker.getTool().getPrice(), equalTo(3.7)); + + ToolFactory toolFactory = (ToolFactory) context.getBean("&tool"); + assertThat(toolFactory.getFactoryId(), equalTo(7070)); + } +} From d13f7b9ed83abfc1317d503958e179f20d872f8a Mon Sep 17 00:00:00 2001 From: DianeDuan Date: Sun, 20 Nov 2016 11:22:42 +0800 Subject: [PATCH 4/6] delete last topic code --- .../properties/PropertiesDefaultListTest.java | 30 ------ .../properties/PropertiesLoadTest.java | 32 ------ .../properties/PropertiesOperationsTest.java | 97 ------------------- .../properties/PropertiesStoreTest.java | 51 ---------- core-java/src/test/resources/app.properties | 3 - core-java/src/test/resources/catalog | 3 - .../src/test/resources/default.properties | 4 - core-java/src/test/resources/icons.xml | 8 -- 8 files changed, 228 deletions(-) delete mode 100644 core-java/src/test/java/com/baeldung/properties/PropertiesDefaultListTest.java delete mode 100644 core-java/src/test/java/com/baeldung/properties/PropertiesLoadTest.java delete mode 100644 core-java/src/test/java/com/baeldung/properties/PropertiesOperationsTest.java delete mode 100644 core-java/src/test/java/com/baeldung/properties/PropertiesStoreTest.java delete mode 100644 core-java/src/test/resources/app.properties delete mode 100644 core-java/src/test/resources/catalog delete mode 100644 core-java/src/test/resources/default.properties delete mode 100644 core-java/src/test/resources/icons.xml diff --git a/core-java/src/test/java/com/baeldung/properties/PropertiesDefaultListTest.java b/core-java/src/test/java/com/baeldung/properties/PropertiesDefaultListTest.java deleted file mode 100644 index 704bb19759..0000000000 --- a/core-java/src/test/java/com/baeldung/properties/PropertiesDefaultListTest.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.baeldung.properties; - -import org.junit.Test; - -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.util.Properties; - -import static org.hamcrest.core.IsEqual.equalTo; -import static org.junit.Assert.assertThat; - -public class PropertiesDefaultListTest { - @Test - public void testDefaultList() throws IOException { - String rootPath = Thread.currentThread().getContextClassLoader().getResource("").getPath(); - String defaultConfigPath = rootPath + "default.properties"; - String appConfigPath = rootPath + "app.properties"; - - Properties defaultProps = new Properties(); - defaultProps.load(new FileInputStream(defaultConfigPath)); - - Properties appProps = new Properties(defaultProps); - appProps.load(new FileInputStream(appConfigPath)); - - assertThat(appProps.getProperty("name"), equalTo("TestApp")); - assertThat(appProps.getProperty("version"), equalTo("1.0")); - assertThat(appProps.getProperty("site"), equalTo("www.google.com")); - } -} diff --git a/core-java/src/test/java/com/baeldung/properties/PropertiesLoadTest.java b/core-java/src/test/java/com/baeldung/properties/PropertiesLoadTest.java deleted file mode 100644 index bcf386bd0f..0000000000 --- a/core-java/src/test/java/com/baeldung/properties/PropertiesLoadTest.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.baeldung.properties; - -import org.junit.Test; - -import java.io.FileInputStream; -import java.io.IOException; -import java.util.Properties; - -public class PropertiesLoadTest { - @Test - public void testLoadFromPropertiesFiles() throws IOException { - String rootPath = Thread.currentThread().getContextClassLoader().getResource("").getPath(); - String appConfigPath = rootPath + "app.properties"; - String catalogConfigPath = rootPath + "catalog"; - - // load from properties file which use .properties as the suffix - Properties appProps = new Properties(); - appProps.load(new FileInputStream(appConfigPath)); - - // load from properties file which not use .properties as the suffix - Properties catalogProps = new Properties(); - catalogProps.load(new FileInputStream(catalogConfigPath)); - } - - @Test - public void testLoadFromXmlFile() throws IOException { - String rootPath = Thread.currentThread().getContextClassLoader().getResource("").getPath(); - String iconConfigPath = rootPath + "icons.xml"; - Properties iconProps = new Properties(); - iconProps.loadFromXML(new FileInputStream(iconConfigPath)); - } -} diff --git a/core-java/src/test/java/com/baeldung/properties/PropertiesOperationsTest.java b/core-java/src/test/java/com/baeldung/properties/PropertiesOperationsTest.java deleted file mode 100644 index 20aa64c385..0000000000 --- a/core-java/src/test/java/com/baeldung/properties/PropertiesOperationsTest.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.baeldung.properties; - -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; -import org.junit.Before; -import org.junit.Test; -import org.testng.annotations.BeforeClass; - -import java.io.FileInputStream; -import java.io.IOException; -import java.io.PrintWriter; -import java.util.Enumeration; -import java.util.List; -import java.util.Properties; -import java.util.Set; - -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.core.IsEqual.equalTo; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; - -public class PropertiesOperationsTest { - private Properties appProps; - - @Before - public void beforeClass() throws IOException { - String rootPath = Thread.currentThread().getContextClassLoader().getResource("").getPath(); - String appConfigPath = rootPath + "app.properties"; - appProps = new Properties(); - appProps.load(new FileInputStream(appConfigPath)); - } - - @Test - public void testGetProperties() { - String appVersion = appProps.getProperty("version"); - String appName = appProps.getProperty("name", "defaultName"); - String appGroup = appProps.getProperty("group", "baeldung"); - String appDownloadAddr = appProps.getProperty("downloadAddr"); - - assertThat(appVersion, equalTo("1.0")); - assertThat(appName, equalTo("TestApp")); - assertThat(appGroup, equalTo("baeldung")); - assertThat(appDownloadAddr, equalTo(null)); - } - - @Test - public void testSetProperties() { - appProps.setProperty("name", "NewAppName"); - appProps.setProperty("downloadAddr", "www.baeldung.com/downloads"); - - String appName = appProps.getProperty("name"); - String appDownloadAddr = appProps.getProperty("downloadAddr"); - - assertThat(appName, equalTo("NewAppName")); - assertThat(appDownloadAddr, equalTo("www.baeldung.com/downloads")); - } - - @Test - public void testRemoveProperties() { - String versionBeforeRemoval = appProps.getProperty("version"); - assertThat(versionBeforeRemoval, equalTo("1.0")); - - appProps.remove("version"); - - String versionAfterRemoval = appProps.getProperty("version"); - assertThat(versionAfterRemoval, equalTo(null)); - } - - @Test - public void testGetEnumerationOfValues() { - Enumeration valueEnumeration = appProps.elements(); - List values = Lists.newArrayList(); - while (valueEnumeration.hasMoreElements()) { - String val = String.valueOf(valueEnumeration.nextElement()); - values.add(val); - } - assertArrayEquals(new String[] {"1.0", "2016-11-12", "TestApp"}, values.toArray()); - } - - @Test - public void testGetEnumerationOfKeys() { - Enumeration keyEnumeration = appProps.keys(); - List keys = Lists.newArrayList(); - while (keyEnumeration.hasMoreElements()) { - String key = String.valueOf(keyEnumeration.nextElement()); - keys.add(key); - } - assertArrayEquals(new String[] {"version", "date", "name"}, keys.toArray()); - } - - @Test - public void testGetSize() { - int size = appProps.size(); - assertThat(size, equalTo(3)); - } -} diff --git a/core-java/src/test/java/com/baeldung/properties/PropertiesStoreTest.java b/core-java/src/test/java/com/baeldung/properties/PropertiesStoreTest.java deleted file mode 100644 index 582fdb3808..0000000000 --- a/core-java/src/test/java/com/baeldung/properties/PropertiesStoreTest.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.baeldung.properties; - -import org.junit.Before; -import org.junit.Test; -import org.testng.annotations.BeforeClass; - -import java.io.*; -import java.util.Properties; - -import static org.hamcrest.core.IsEqual.equalTo; -import static org.junit.Assert.assertThat; - -public class PropertiesStoreTest { - private static Properties appProps = new Properties(); - - @Before - public void before() throws IOException { - String rootPath = Thread.currentThread().getContextClassLoader().getResource("").getPath(); - String appConfigPath = rootPath + "app.properties"; - - // load the original properties - appProps.load(new FileInputStream(appConfigPath)); - - // update property list - appProps.setProperty("name", "NewAppName"); - appProps.setProperty("downloadAddr", "www.baeldung.com/downloads"); - } - - @Test - public void testStoreToPropertiesFile() throws IOException { - String rootPath = Thread.currentThread().getContextClassLoader().getResource("").getPath(); - String newAppConfigPropertiesFile = rootPath + "newApp.properties"; - appProps.store(new FileWriter(newAppConfigPropertiesFile), "store to properties file"); - - - Properties verifyProps = new Properties(); - verifyProps.load(new FileInputStream(newAppConfigPropertiesFile)); - assertThat(verifyProps.getProperty("name"), equalTo("NewAppName")); - } - - @Test - public void testStoreToXmlFile() throws IOException { - String rootPath = Thread.currentThread().getContextClassLoader().getResource("").getPath(); - String newAppConfigXmlFile = rootPath + "newApp.xml"; - appProps.storeToXML(new FileOutputStream(newAppConfigXmlFile), "store to xml file"); - - Properties verifyProps = new Properties(); - verifyProps.loadFromXML(new FileInputStream(newAppConfigXmlFile)); - assertThat(verifyProps.getProperty("downloadAddr"), equalTo("www.baeldung.com/downloads")); - } -} diff --git a/core-java/src/test/resources/app.properties b/core-java/src/test/resources/app.properties deleted file mode 100644 index ff6174ec2a..0000000000 --- a/core-java/src/test/resources/app.properties +++ /dev/null @@ -1,3 +0,0 @@ -version=1.0 -name=TestApp -date=2016-11-12 \ No newline at end of file diff --git a/core-java/src/test/resources/catalog b/core-java/src/test/resources/catalog deleted file mode 100644 index 488513d0ce..0000000000 --- a/core-java/src/test/resources/catalog +++ /dev/null @@ -1,3 +0,0 @@ -c1=files -c2=images -c3=videos \ No newline at end of file diff --git a/core-java/src/test/resources/default.properties b/core-java/src/test/resources/default.properties deleted file mode 100644 index df1bab371c..0000000000 --- a/core-java/src/test/resources/default.properties +++ /dev/null @@ -1,4 +0,0 @@ -site=www.google.com -name=DefaultAppName -topic=Properties -category=core-java \ No newline at end of file diff --git a/core-java/src/test/resources/icons.xml b/core-java/src/test/resources/icons.xml deleted file mode 100644 index 0db7b2699a..0000000000 --- a/core-java/src/test/resources/icons.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - xml example - icon1.jpg - icon2.jpg - icon3.jpg - \ No newline at end of file From 77240dc024831aa643e0c2c885e09e92c15fbf7a Mon Sep 17 00:00:00 2001 From: DianeDuan Date: Mon, 21 Nov 2016 20:41:33 +0800 Subject: [PATCH 5/6] delete extra comments and variable assignments, use guava precondition for check --- spring-core/pom.xml | 5 +++++ .../InitializationToolFactory.java | 19 +++++++++---------- .../factorybean/NonSingleToolFactory.java | 8 ++++---- .../factorybean/PostConstructToolFactory.java | 19 +++++++++---------- .../factorybean/SingleToolFactory.java | 8 ++++---- .../java/com/baeldung/factorybean/Tool.java | 6 +++--- .../com/baeldung/factorybean/ToolFactory.java | 8 ++++---- .../java/com/baeldung/factorybean/Worker.java | 4 ++-- .../factorybean-abstract-spring-ctx.xml | 4 ++-- .../resources/factorybean-init-spring-ctx.xml | 4 ++-- .../factorybean-postconstruct-spring-ctx.xml | 4 ++-- .../main/resources/factorybean-spring-ctx.xml | 4 ++-- .../FactoryBeanInitializeTest.java | 5 ++--- 13 files changed, 50 insertions(+), 48 deletions(-) diff --git a/spring-core/pom.xml b/spring-core/pom.xml index 798a717d01..e8ab8b00c4 100644 --- a/spring-core/pom.xml +++ b/spring-core/pom.xml @@ -50,6 +50,11 @@ 4.12 test + + com.google.guava + guava + 20.0 + diff --git a/spring-core/src/main/java/com/baeldung/factorybean/InitializationToolFactory.java b/spring-core/src/main/java/com/baeldung/factorybean/InitializationToolFactory.java index 925ba2d8e4..6d2fd2564e 100644 --- a/spring-core/src/main/java/com/baeldung/factorybean/InitializationToolFactory.java +++ b/spring-core/src/main/java/com/baeldung/factorybean/InitializationToolFactory.java @@ -1,22 +1,21 @@ package com.baeldung.factorybean; +import static com.google.common.base.Preconditions.checkArgument; + import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; +import org.springframework.util.StringUtils; public class InitializationToolFactory implements FactoryBean, InitializingBean { - private int factoryId;// standard setters and getters - private int toolId;// standard setters and getters - private String toolName;// standard setters and getters - private double toolPrice;// standard setters and getters + private int factoryId; + private int toolId; + private String toolName; + private double toolPrice; @Override public void afterPropertiesSet() throws Exception { - if (toolName == null || toolName.equals("")) { - throw new IllegalArgumentException("tool name cannot be empty"); - } - if (toolPrice < 0) { - throw new IllegalArgumentException("tool price should not be less than 0"); - } + checkArgument(!StringUtils.isEmpty(toolName), "tool name cannot be empty"); + checkArgument(toolPrice >= 0, "tool price should not be less than 0"); } @Override diff --git a/spring-core/src/main/java/com/baeldung/factorybean/NonSingleToolFactory.java b/spring-core/src/main/java/com/baeldung/factorybean/NonSingleToolFactory.java index 0cd80eab41..c818b775eb 100644 --- a/spring-core/src/main/java/com/baeldung/factorybean/NonSingleToolFactory.java +++ b/spring-core/src/main/java/com/baeldung/factorybean/NonSingleToolFactory.java @@ -3,10 +3,10 @@ package com.baeldung.factorybean; import org.springframework.beans.factory.config.AbstractFactoryBean; public class NonSingleToolFactory extends AbstractFactoryBean { - private int factoryId;// standard setters and getters - private int toolId;// standard setters and getters - private String toolName;// standard setters and getters - private double toolPrice;// standard setters and getters + private int factoryId; + private int toolId; + private String toolName; + private double toolPrice; public NonSingleToolFactory() { setSingleton(false); diff --git a/spring-core/src/main/java/com/baeldung/factorybean/PostConstructToolFactory.java b/spring-core/src/main/java/com/baeldung/factorybean/PostConstructToolFactory.java index 8298f6f4db..47db05d271 100644 --- a/spring-core/src/main/java/com/baeldung/factorybean/PostConstructToolFactory.java +++ b/spring-core/src/main/java/com/baeldung/factorybean/PostConstructToolFactory.java @@ -1,14 +1,17 @@ package com.baeldung.factorybean; +import static com.google.common.base.Preconditions.checkArgument; + import javax.annotation.PostConstruct; import org.springframework.beans.factory.FactoryBean; +import org.springframework.util.StringUtils; public class PostConstructToolFactory implements FactoryBean { - private int factoryId;// standard setters and getters - private int toolId;// standard setters and getters - private String toolName;// standard setters and getters - private double toolPrice;// standard setters and getters + private int factoryId; + private int toolId; + private String toolName; + private double toolPrice; @Override public Tool getObject() throws Exception { @@ -27,12 +30,8 @@ public class PostConstructToolFactory implements FactoryBean { @PostConstruct public void checkParams() { - if (toolName == null || toolName.equals("")) { - throw new IllegalArgumentException("tool name cannot be empty"); - } - if (toolPrice < 0) { - throw new IllegalArgumentException("tool price should not be less than 0"); - } + checkArgument(!StringUtils.isEmpty(toolName), "tool name cannot be empty"); + checkArgument(toolPrice >= 0, "tool price should not be less than 0"); } public int getFactoryId() { diff --git a/spring-core/src/main/java/com/baeldung/factorybean/SingleToolFactory.java b/spring-core/src/main/java/com/baeldung/factorybean/SingleToolFactory.java index 94d68ef113..bc0c2d79c0 100644 --- a/spring-core/src/main/java/com/baeldung/factorybean/SingleToolFactory.java +++ b/spring-core/src/main/java/com/baeldung/factorybean/SingleToolFactory.java @@ -4,10 +4,10 @@ import org.springframework.beans.factory.config.AbstractFactoryBean; //no need to set singleton property because default value is true public class SingleToolFactory extends AbstractFactoryBean { - private int factoryId;// standard setters and getters - private int toolId;// standard setters and getters - private String toolName;// standard setters and getters - private double toolPrice;// standard setters and getters + private int factoryId; + private int toolId; + private String toolName; + private double toolPrice; @Override public Class getObjectType() { diff --git a/spring-core/src/main/java/com/baeldung/factorybean/Tool.java b/spring-core/src/main/java/com/baeldung/factorybean/Tool.java index abdd074e9a..a7f7f7681e 100644 --- a/spring-core/src/main/java/com/baeldung/factorybean/Tool.java +++ b/spring-core/src/main/java/com/baeldung/factorybean/Tool.java @@ -1,9 +1,9 @@ package com.baeldung.factorybean; public class Tool { - private int id;// standard setters and getters - private String name;// standard setters and getters - private double price;// standard setters and getters + private int id; + private String name; + private double price; public Tool() { } diff --git a/spring-core/src/main/java/com/baeldung/factorybean/ToolFactory.java b/spring-core/src/main/java/com/baeldung/factorybean/ToolFactory.java index 9b2f7fa42e..ca8f82eadb 100644 --- a/spring-core/src/main/java/com/baeldung/factorybean/ToolFactory.java +++ b/spring-core/src/main/java/com/baeldung/factorybean/ToolFactory.java @@ -3,10 +3,10 @@ package com.baeldung.factorybean; import org.springframework.beans.factory.FactoryBean; public class ToolFactory implements FactoryBean { - private int factoryId;// standard setters and getters - private int toolId;// standard setters and getters - private String toolName;// standard setters and getters - private double toolPrice;// standard setters and getters + private int factoryId; + private int toolId; + private String toolName; + private double toolPrice; @Override public Tool getObject() throws Exception { diff --git a/spring-core/src/main/java/com/baeldung/factorybean/Worker.java b/spring-core/src/main/java/com/baeldung/factorybean/Worker.java index 070322a5f9..9a35c0656b 100644 --- a/spring-core/src/main/java/com/baeldung/factorybean/Worker.java +++ b/spring-core/src/main/java/com/baeldung/factorybean/Worker.java @@ -1,8 +1,8 @@ package com.baeldung.factorybean; public class Worker { - private String number;// standard setters and getters - private Tool tool;// standard setters and getters + private String number; + private Tool tool; public Worker() { } diff --git a/spring-core/src/main/resources/factorybean-abstract-spring-ctx.xml b/spring-core/src/main/resources/factorybean-abstract-spring-ctx.xml index 2f34e2e1cf..6bce114d9c 100644 --- a/spring-core/src/main/resources/factorybean-abstract-spring-ctx.xml +++ b/spring-core/src/main/resources/factorybean-abstract-spring-ctx.xml @@ -1,6 +1,6 @@ - diff --git a/spring-core/src/main/resources/factorybean-init-spring-ctx.xml b/spring-core/src/main/resources/factorybean-init-spring-ctx.xml index f5835c1e70..47722b6d3d 100644 --- a/spring-core/src/main/resources/factorybean-init-spring-ctx.xml +++ b/spring-core/src/main/resources/factorybean-init-spring-ctx.xml @@ -1,6 +1,6 @@ - diff --git a/spring-core/src/main/resources/factorybean-postconstruct-spring-ctx.xml b/spring-core/src/main/resources/factorybean-postconstruct-spring-ctx.xml index 81e02a0b35..94a4f407a8 100644 --- a/spring-core/src/main/resources/factorybean-postconstruct-spring-ctx.xml +++ b/spring-core/src/main/resources/factorybean-postconstruct-spring-ctx.xml @@ -1,7 +1,7 @@ - diff --git a/spring-core/src/main/resources/factorybean-spring-ctx.xml b/spring-core/src/main/resources/factorybean-spring-ctx.xml index 800e489ba0..ab0c646bb0 100644 --- a/spring-core/src/main/resources/factorybean-spring-ctx.xml +++ b/spring-core/src/main/resources/factorybean-spring-ctx.xml @@ -1,6 +1,6 @@ - diff --git a/spring-core/src/test/java/com/baeldung/factorybean/FactoryBeanInitializeTest.java b/spring-core/src/test/java/com/baeldung/factorybean/FactoryBeanInitializeTest.java index 851c15a3ec..848eea216a 100644 --- a/spring-core/src/test/java/com/baeldung/factorybean/FactoryBeanInitializeTest.java +++ b/spring-core/src/test/java/com/baeldung/factorybean/FactoryBeanInitializeTest.java @@ -1,17 +1,16 @@ package com.baeldung.factorybean; import org.junit.Test; -import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; public class FactoryBeanInitializeTest { @Test(expected = Exception.class) public void testInitializationToolFactory() { - ApplicationContext context = new ClassPathXmlApplicationContext("classpath:factorybean-init-spring-ctx.xml"); + new ClassPathXmlApplicationContext("classpath:factorybean-init-spring-ctx.xml"); } @Test(expected = Exception.class) public void testPostConstructToolFactory() { - ApplicationContext context = new ClassPathXmlApplicationContext("classpath:factorybean-postconstruct-spring-ctx.xml"); + new ClassPathXmlApplicationContext("classpath:factorybean-postconstruct-spring-ctx.xml"); } } From e84957c768eace2e933a935d6c76d87bc251fcd8 Mon Sep 17 00:00:00 2001 From: DianeDuan Date: Mon, 21 Nov 2016 21:51:20 +0800 Subject: [PATCH 6/6] change expect exception in ut --- .../com/baeldung/factorybean/FactoryBeanInitializeTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/spring-core/src/test/java/com/baeldung/factorybean/FactoryBeanInitializeTest.java b/spring-core/src/test/java/com/baeldung/factorybean/FactoryBeanInitializeTest.java index 848eea216a..673bab6f63 100644 --- a/spring-core/src/test/java/com/baeldung/factorybean/FactoryBeanInitializeTest.java +++ b/spring-core/src/test/java/com/baeldung/factorybean/FactoryBeanInitializeTest.java @@ -1,15 +1,16 @@ package com.baeldung.factorybean; import org.junit.Test; +import org.springframework.beans.factory.BeanCreationException; import org.springframework.context.support.ClassPathXmlApplicationContext; public class FactoryBeanInitializeTest { - @Test(expected = Exception.class) + @Test(expected = BeanCreationException.class) public void testInitializationToolFactory() { new ClassPathXmlApplicationContext("classpath:factorybean-init-spring-ctx.xml"); } - @Test(expected = Exception.class) + @Test(expected = BeanCreationException.class) public void testPostConstructToolFactory() { new ClassPathXmlApplicationContext("classpath:factorybean-postconstruct-spring-ctx.xml"); }