Code style

BjoernKW · Apr 19, 2015 · 15428ec · 15428ec
1 parent 83914e5
commit 15428ec
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 28 deletions.
diff --git a/pom.xml b/pom.xml
@@ -241,6 +241,13 @@
             <version>3.12.0</version>
             <scope>provided</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.hsqldb</groupId>
+            <artifactId>hsqldb</artifactId>
+            <version>2.3.2</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
         <finalName>ZenQuery</finalName>

diff --git a/src/main/java/com/zenquery/model/dao/impl/JdbcDatabaseConnectionDAO.java b/src/main/java/com/zenquery/model/dao/impl/JdbcDatabaseConnectionDAO.java
@@ -54,7 +54,6 @@ public void setDataSourceFactory(BasicDataSourceFactory dataSourceFactory) {
         this.dataSourceFactory = dataSourceFactory;
     }
 
-    @Override
     public DatabaseConnection find(Integer id) {
         String sql = "SELECT * FROM database_connections WHERE id = ?";
 
@@ -65,7 +64,6 @@ public DatabaseConnection find(Integer id) {
         return databaseConnection;
     }
 
-    @Override
     public List<DatabaseConnection> findAll() {
         String sql = "SELECT * FROM database_connections";
 
@@ -76,15 +74,13 @@ public List<DatabaseConnection> findAll() {
         return databaseConnections;
     }
 
-    @Override
     public Number insert(final DatabaseConnection databaseConnection) {
         final String sql = "INSERT INTO database_connections (name, url, username, password) VALUES (?, ?, ?, ?)";
 
         jdbcTemplate = new JdbcTemplate(dataSource);
         KeyHolder keyHolder = new GeneratedKeyHolder();
 
         PreparedStatementCreator preparedStatementCreator = new PreparedStatementCreator() {
-            @Override
             public PreparedStatement createPreparedStatement(Connection connection)
                     throws SQLException {
                 PreparedStatement preparedStatement = connection.prepareStatement(sql, new String[] { "id" });
@@ -192,7 +188,6 @@ public PreparedStatement createPreparedStatement(Connection connection)
         return keyHolder.getKey();
     }
 
-    @Override
     public void update(Integer id, DatabaseConnection databaseConnection) {
         String sql = "UPDATE database_connections SET name = ?, url = ?, username = ?, password = ? WHERE id = ?";
 
@@ -209,7 +204,6 @@ public void update(Integer id, DatabaseConnection databaseConnection) {
         );
     }
 
-    @Override
     public void delete(Integer id) {
         queryDAO.deleteByDatabaseConnectionId(id);
 

diff --git a/src/main/java/com/zenquery/model/dao/impl/JdbcQueryDAO.java b/src/main/java/com/zenquery/model/dao/impl/JdbcQueryDAO.java
@@ -50,7 +50,6 @@ public void setQueryVersionDAO(QueryVersionDAO queryVersionDAO) {
         this.queryVersionDAO = queryVersionDAO;
     }
 
-    @Override
     public Query find(Integer id) {
         String sql = databaseDriverProperties.getProperty(dbUrl.getScheme() + ".queries.find");
 
@@ -61,7 +60,6 @@ public Query find(Integer id) {
         return query;
     }
 
-    @Override
     public Query findByKey(String key) {
         String sql = databaseDriverProperties.getProperty(dbUrl.getScheme() + ".queries.findByKey");
 
@@ -72,7 +70,6 @@ public Query findByKey(String key) {
         return query;
     }
 
-    @Override
     public List<Query> findByDatabaseConnectionId(Integer id) {
         String sql = databaseDriverProperties.getProperty(dbUrl.getScheme() + ".queries.findByDatabaseConnectionId");
 
@@ -83,7 +80,6 @@ public List<Query> findByDatabaseConnectionId(Integer id) {
         return queries;
     }
 
-    @Override
     public List<Query> findAll() {
         String sql = databaseDriverProperties.getProperty(dbUrl.getScheme() + ".queries.findAll");
 
@@ -94,7 +90,6 @@ public List<Query> findAll() {
         return queries;
     }
 
-    @Override
     public Number insert(final Query query) {
         final String sql = "INSERT INTO queries (key, database_connection_id) VALUES (?, ?)";
 
@@ -104,7 +99,6 @@ public Number insert(final Query query) {
         KeyHolder keyHolder = new GeneratedKeyHolder();
 
         PreparedStatementCreator preparedStatementCreator = new PreparedStatementCreator() {
-            @Override
             public PreparedStatement createPreparedStatement(Connection connection)
                     throws SQLException {
                 PreparedStatement preparedStatement = connection.prepareStatement(sql, new String[] { "id" });
@@ -130,7 +124,6 @@ public PreparedStatement createPreparedStatement(Connection connection)
         return keyHolder.getKey();
     }
 
-    @Override
     public void update(Integer id, Query query) {
         QueryVersion previousQueryVersion = queryVersionDAO.findCurrentByQueryId(id);
 
@@ -148,7 +141,6 @@ public void update(Integer id, Query query) {
         }
     }
 
-    @Override
     public void delete(Integer id) {
         queryVersionDAO.deleteByQueryId(id);
 
@@ -158,7 +150,6 @@ public void delete(Integer id) {
         jdbcTemplate.update(sql, new Object[] { id });
     }
 
-    @Override
     public void deleteByDatabaseConnectionId(Integer id) {
         List<Query> queries = findByDatabaseConnectionId(id);
         for (Query query : queries) {

diff --git a/src/main/java/com/zenquery/model/dao/impl/JdbcQueryVersionDAO.java b/src/main/java/com/zenquery/model/dao/impl/JdbcQueryVersionDAO.java
@@ -27,7 +27,6 @@ public void setDataSource(DataSource dataSource) {
         this.dataSource = dataSource;
     }
 
-    @Override
     public QueryVersion find(Integer id) {
         String sql = "SELECT * FROM query_versions WHERE id = ?";
 
@@ -38,7 +37,6 @@ public QueryVersion find(Integer id) {
         return queryVersion;
     }
 
-    @Override
     public QueryVersion findByQueryIdAndVersion(Integer id, Integer version) {
         String sql = "SELECT * FROM query_versions WHERE query_id = ? AND version = ?";
 
@@ -49,7 +47,6 @@ public QueryVersion findByQueryIdAndVersion(Integer id, Integer version) {
         return queryVersion;
     }
 
-    @Override
     public QueryVersion findCurrentByQueryId(Integer id) {
         String sql = "SELECT * FROM query_versions WHERE query_id = ? AND is_current_version = TRUE";
 
@@ -60,7 +57,6 @@ public QueryVersion findCurrentByQueryId(Integer id) {
         return queryVersion;
     }
 
-    @Override
     public List<QueryVersion> findByQueryId(Integer id) {
         String sql = "SELECT * FROM query_versions WHERE query_id = ?";
 
@@ -71,7 +67,6 @@ public List<QueryVersion> findByQueryId(Integer id) {
         return queryVersions;
     }
 
-    @Override
     public List<QueryVersion> findPreviousVersionsByQueryId(Integer id) {
         String sql = "SELECT * FROM query_versions WHERE query_id = ? AND is_current_version = FALSE ORDER BY ID DESC";
 
@@ -82,7 +77,6 @@ public List<QueryVersion> findPreviousVersionsByQueryId(Integer id) {
         return queryVersions;
     }
 
-    @Override
     public List<QueryVersion> findAll() {
         String sql = "SELECT * FROM query_versions";
 
@@ -93,15 +87,13 @@ public List<QueryVersion> findAll() {
         return queryVersions;
     }
 
-    @Override
     public Number insert(final QueryVersion queryVersion) {
         final String sql = "INSERT INTO query_versions (content, version, is_current_version, query_id) VALUES (?, ?, ?, ?)";
 
         jdbcTemplate = new JdbcTemplate(dataSource);
         KeyHolder keyHolder = new GeneratedKeyHolder();
 
         PreparedStatementCreator preparedStatementCreator = new PreparedStatementCreator() {
-            @Override
             public PreparedStatement createPreparedStatement(Connection connection)
                     throws SQLException {
                 PreparedStatement preparedStatement = connection.prepareStatement(sql, new String[] { "id" });
@@ -122,7 +114,6 @@ public PreparedStatement createPreparedStatement(Connection connection)
         return keyHolder.getKey();
     }
 
-    @Override
     public void update(Integer id, QueryVersion queryVersion) {
         String sql = "UPDATE query_versions SET content = ?, version = ?, is_current_version = ? WHERE id = ?";
 
@@ -138,15 +129,13 @@ public void update(Integer id, QueryVersion queryVersion) {
         );
     }
 
-    @Override
     public void delete(Integer id) {
         String sql = "DELETE FROM query_versions WHERE id = ?";
 
         jdbcTemplate = new JdbcTemplate(dataSource);
         jdbcTemplate.update(sql, new Object[] { id });
     }
 
-    @Override
     public void deleteByQueryId(Integer id) {
         String sql = "DELETE FROM query_versions WHERE query_id = ?";
 

diff --git a/src/test/java/com/zenquery/AppTests.java b/src/test/java/com/zenquery/AppTests.java
@@ -17,7 +17,13 @@
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @WebAppConfiguration
-@ContextConfiguration("file:src/main/webapp/WEB-INF/dispatcher-servlet.xml")
+@ContextConfiguration(
+        locations = {
+                "file:src/test/resources/applicationContext.xml",
+                "file:src/main/webapp/WEB-INF/dispatcher-servlet.xml",
+                "file:src/main/webapp/WEB-INF/spring-security-local.xml"
+        }
+)
 public class AppTests {
     private MockMvc mockMvc;
 
@@ -34,6 +40,6 @@ public void setup() {
     public void simple() throws Exception {
         mockMvc.perform(get("/"))
                 .andExpect(status().isOk())
-                .andExpect(view().name("hello"));
+                .andExpect(view().name("index"));
     }
 }
diff --git a/src/test/resources/applicationContext.xml b/src/test/resources/applicationContext.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:jdbc="http://www.springframework.org/schema/jdbc"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd">
+
+    <context:property-placeholder />
+
+    <bean id="databaseDriverProperties"
+          class="org.springframework.beans.factory.config.PropertiesFactoryBean">
+        <property name="locations">
+            <list>
+                <value>classpath:databaseDriver.properties</value>
+                <value>classpath:queries.properties</value>
+            </list>
+        </property>
+    </bean>
+
+    <jdbc:embedded-database id="dataSource" />
+
+    <bean id="databaseConnectionDAO" class="com.zenquery.model.dao.impl.JdbcDatabaseConnectionDAO">
+        <property name="databaseDriverProperties" ref="databaseDriverProperties" />
+        <property name="dataSource" ref="dataSource" />
+        <property name="queryDAO" ref="queryDAO" />
+        <property name="dataSourceFactory" ref="dataSourceFactory" />
+    </bean>
+
+    <bean id="queryDAO" class="com.zenquery.model.dao.impl.JdbcQueryDAO">
+        <property name="dbUrl" value="jdbc:h2:./" />
+        <property name="databaseDriverProperties" ref="databaseDriverProperties" />
+        <property name="dataSource" ref="dataSource" />
+        <property name="queryVersionDAO" ref="queryVersionDAO" />
+    </bean>
+
+    <bean id="queryVersionDAO" class="com.zenquery.model.dao.impl.JdbcQueryVersionDAO">
+        <property name="dataSource" ref="dataSource" />
+    </bean>
+
+    <bean class="com.zenquery.util.BasicDataSourceFactory" id="dataSourceFactory">
+        <property name="databaseDriverProperties" ref="databaseDriverProperties" />
+    </bean>
+</beans>