Merge branch 'development'

Author: AnkBurov

README.md

@@ -16,7 +16,13 @@ The application itself works by parsing log files for call-id strings and closin
 * Run created task and check /etc/application.log for any errors or exceptions.
 
 ## Release notes ##
-### 1.01 ###
+
+### 1.1 ###
+* Added SQLite database as a persistent database engine instead of NoSQL MapDB.
+* Reworked application architecture.
+* In case of any problems with DB, version 1.01 of this application can be used.
+
+#### 1.01 ####
 * Added new configuration timers: sipByeSenderPause and applicationClosingTimer. Detailed description about each timer see in config.properties file. 
 * Fixed bug caused some performance slowdown on processing inbound responses
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>ru.cti</groupId>
     <artifactId>verintbyehandler</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <properties>
@@ -37,26 +37,6 @@
                     <target>1.6</target>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>1.1.1</version>
-                <executions>
-                    <execution>
-                        <phase>test</phase>
-                        <goals>
-                            <goal>java</goal>
-                        </goals>
-                        <configuration>
-                            <mainClass>ru.cti.verintsipbyehandler.Main</mainClass>
-                            <arguments>
-                                <argument>arg0</argument>
-                                <argument>arg1</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>properties-maven-plugin</artifactId>
@@ -81,7 +61,7 @@
                 <configuration>
                     <archive>
                         <manifest>
-                            <mainClass>ru.cti.verintsipbyehandler.Main</mainClass>
+                            <mainClass>ru.cti.verintsipbyehandler.controller.Main</mainClass>
                         </manifest>
                     </archive>
                     <descriptorRefs>
@@ -126,9 +106,9 @@
             <version>${spring.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.mapdb</groupId>
-            <artifactId>mapdb</artifactId>
-            <version>2.0-beta13</version>
+            <groupId>org.xerial</groupId>
+            <artifactId>sqlite-jdbc</artifactId>
+            <version>3.8.11.2</version>
         </dependency>
         <dependency>
             <groupId>javax.sip</groupId>

src/main/java/ru/cti/verintsipbyehandler/Configuration.java

@@ -5,19 +5,27 @@
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.context.annotation.PropertySources;
 import org.springframework.core.env.Environment;
+import org.springframework.jdbc.datasource.SimpleDriverDataSource;
+import ru.cti.verintsipbyehandler.controller.CallHandler;
+import ru.cti.verintsipbyehandler.controller.CallParser;
+import ru.cti.verintsipbyehandler.controller.Main;
+import ru.cti.verintsipbyehandler.controller.dao.DAOFacade;
+import ru.cti.verintsipbyehandler.controller.SipLayer;
+import ru.cti.verintsipbyehandler.model.factory.CallsFactory;
 
 import javax.sip.InvalidArgumentException;
 import javax.sip.ObjectInUseException;
 import javax.sip.PeerUnavailableException;
 import javax.sip.TransportNotSupportedException;
+import javax.sql.DataSource;
 import java.net.UnknownHostException;
 import java.util.TooManyListenersException;
 
 /**
  * Spring Java configuration file
  */
 @org.springframework.context.annotation.Configuration
-@PropertySources({ @PropertySource(value = "file:etc/config.properties")})
+@PropertySources({@PropertySource(value = "file:etc/config.properties")})
 public class Configuration {
     @Autowired
     Environment env;
@@ -27,14 +35,6 @@ public Main main() {
         return new Main(Integer.parseInt(env.getProperty("applicationClosingTimer")));
     }
 
-    @Bean
-    public ParseAndProcessCalls parseAndProcessCalls() throws Exception {
-        return new ParseAndProcessCalls(env.getProperty("regexp"),
-                env.getProperty("risLogsFolderPath"),
-                Integer.parseInt(env.getProperty("callTerminationTimeout")),
-                Integer.parseInt(env.getProperty("completedCallDeletionTimer")),
-                Integer.parseInt(env.getProperty("sipByeSenderPause")));
-    }
 
     @Bean
     public SipLayer sipLayer() throws InvalidArgumentException, PeerUnavailableException, UnknownHostException,
@@ -45,4 +45,35 @@ public SipLayer sipLayer() throws InvalidArgumentException, PeerUnavailableExcep
                 env.getProperty("sip.destinationAddress"),
                 env.getProperty("sipLibraryLogLevel"));
     }
+
+    @Bean
+    public CallsFactory callsFabric() {
+        return new CallsFactory();
+    }
+
+    @Bean
+    public DataSource dataSource() {
+        SimpleDriverDataSource dataSource = new SimpleDriverDataSource();
+        dataSource.setDriverClass(org.sqlite.JDBC.class);
+        dataSource.setUrl("jdbc:sqlite:db/sqlite.db");
+        return dataSource;
+    }
+
+    @Bean
+    public DAOFacade daoFacade() {
+        return new DAOFacade(dataSource());
+    }
+
+    @Bean
+    public CallParser callParser() {
+        return new CallParser(env.getProperty("risLogsFolderPath"),
+                env.getProperty("regexp"));
+    }
+
+    @Bean
+    public CallHandler callHandler() {
+        return new CallHandler(Long.parseLong(env.getProperty("callTerminationTimeout")),
+                Long.parseLong(env.getProperty("completedCallDeletionTimer")),
+                Integer.parseInt(env.getProperty("sipByeSenderPause")));
+    }
 }