Commit 2d092c1e authored by akucera's avatar akucera
Browse files

refactoring, tests, input sanitizing

parent 33747504

CommonComponents/pom.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -44,7 +44,7 @@ 
    <dependency>

    <dependency>

      <groupId>junit</groupId>

      <groupId>junit</groupId>

      <artifactId>junit</artifactId>

      <artifactId>junit</artifactId>

      <version>4.9</version>

      <version>4.12</version>

      <scope>test</scope>

      <scope>test</scope>

    </dependency>

    </dependency>

DataAccessAPI/pom.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -51,7 +51,7 @@ 
        <dependency>

        <dependency>

            <groupId>junit</groupId>

            <groupId>junit</groupId>

            <artifactId>junit</artifactId>

            <artifactId>junit</artifactId>

            <version>4.9</version>

            <version>4.12</version>

            <scope>test</scope>

            <scope>test</scope>

        </dependency>

        </dependency>

DataAccessAPI/src/main/java/cz/muni/fi/lasaris/sbms/data/logic/ConnectorProvider.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -21,6 +21,7 @@ public class ConnectorProvider { 
			

			

		String bcs = props.getProperty("data.connectors.bas");

		String bcs = props.getProperty("data.connectors.bas");

		

		

		// starting bas connectors first - some archive connectors might be dependent on them

		if(bcs != null) {

		if(bcs != null) {

			for(String bc : bcs.split(",")) {

			for(String bc : bcs.split(",")) {

				String bct = bc.trim();

				String bct = bc.trim();

DataAccessAPI/src/main/resources/data.properties

+6 −3
Original line number Original line Diff line number Diff line 
data.connectors.archive=historian

data.connectors.bas=bacnet

data.connectors.bas=bacnet

data.connectors.archive=historian,bactrend





data.connectors.archive.historian.class=cz.muni.fi.lasaris.sbms.data.connectors.plugins.DeltaHistorianConnector





data.connectors.bas.bacnet.class=cz.muni.fi.lasaris.sbms.data.connectors.plugins.BACnetConnector

data.connectors.archive.bactrend.class=cz.muni.fi.lasaris.sbms.data.connectors.bacnet.BACnetTrendsFacade



data.connectors.archive.historian.class=cz.muni.fi.lasaris.sbms.data.connectors.bacnet.DeltaHistorianConnector



data.connectors.bas.bacnet.class=cz.muni.fi.lasaris.sbms.data.connectors.bacnet.PresentValuesFacade

data.connectors.bas.bacnet.ip.address=147.251.130.76

data.connectors.bas.bacnet.ip.address=147.251.130.76

data.connectors.bas.bacnet.ip.broadcast=147.251.130.255

data.connectors.bas.bacnet.ip.broadcast=147.251.130.255

data.connectors.bas.bacnet.ip.mask=255.255.255.224

data.connectors.bas.bacnet.ip.mask=255.255.255.224

ProviderInterfaces/pom.xml

+8 −0
Original line number Original line Diff line number Diff line
@@ -13,6 +13,14 @@ 
    <version>2.8.4</version>

    <version>2.8.4</version>

</dependency>

</dependency>

   -->

   -->

   

   <dependency>

      <groupId>junit</groupId>

      <artifactId>junit</artifactId>

      <version>4.12</version>

      <scope>test</scope>

    </dependency>

   

  </dependencies>

  </dependencies>

  

  

  <build>

  <build>