Skip to content

Commit

Permalink
Merge pull request #14 from madgeek-arc/feature/elastic-jdbc
Browse files Browse the repository at this point in the history 
Refactoring
  • Loading branch information
@spyroukostas
spyroukostas authored Feb 29, 2024
2 parents c8f5a63 + 9f793fe commit bcdc02c
Show file tree
Hide file tree
Showing 19 changed files with 335 additions and 361 deletions.
27 changes: 13 additions & 14 deletions Application/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>gr.uoa.di.madgik</groupId>
Expand All @@ -11,9 +11,8 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<!-- <version>1.5.16.RELEASE</version> -->
<version>2.3.1.RELEASE</version>
<relativePath /> <!-- lookup parent from repository -->
<version>2.3.1.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>

<properties>
Expand All @@ -25,7 +24,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
<exclusions>
<exclusions>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
Expand All @@ -34,10 +33,10 @@
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand All @@ -49,11 +48,11 @@
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId>
<scope>runtime</scope>
</dependency>

<!--ChartDataFormatter & DBAccess module dependencies-->
<dependency>
Expand Down
1 change: 0 additions & 1 deletion Application/src/main/java/gr/uoa/di/madgik/StatisticChartGenerator_App/appBoot.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

import java.util.Properties;

@ComponentScan(basePackages = {"gr/uoa/di/madgik/ChartDataFormatter", "gr/uoa/di/madgik/statstool"})
@SpringBootApplication(scanBasePackages = {"gr/uoa/di/madgik/ChartDataFormatter", "gr/uoa/di/madgik/statstool"})
@PropertySource(value="classpath:application.yml", factory = YamlPropertySourceFactory.class)
public class appBoot extends SpringBootServletInitializer {
Expand Down
98 changes: 52 additions & 46 deletions ChartDataFormatter/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,65 +1,71 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>gr.uoa.di.madgik</groupId>
<artifactId>Statistic-chart-generator-ChartDataFormatter</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<groupId>gr.uoa.di.madgik</groupId>
<artifactId>Statistic-chart-generator-ChartDataFormatter</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<!-- <version>1.5.16.RELEASE</version> -->
<version>2.3.1.RELEASE</version>
<relativePath/>
</parent>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.1.RELEASE</version>
<relativePath/>
</parent>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<tomcat.version>7.0.68</tomcat.version>
</properties>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<tomcat.version>7.0.68</tomcat.version>
</properties>

<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<exclusions>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf</artifactId>
</dependency>
<!--
<dependency>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf</artifactId>
</dependency>
<!--
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
</dependency>
-->

<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
<version>1.11.3</version>
</dependency>

<!--Dependency to DBAccess-->
<dependency>
<groupId>gr.uoa.di.madgik</groupId>
<artifactId>Statistic-chart-generator-DBAccess</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<dependency>
<groupId>gr.uoa.di.madgik</groupId>
<artifactId>Statistic-chart-generator-DBAccess</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>

</project>
4 changes: 2 additions & 2 deletions ...matter/src/main/java/gr/uoa/di/madgik/ChartDataFormatter/DataFormatter/DataFormatter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ public List<String> getXAxisCategories(List<Result> dbAccessResults, boolean sor
if (result.getRows().isEmpty())
continue;

for (List<String> row : result.getRows()) {
for (List<?> row : result.getRows()) {
// Get the first groupBy of the result row
String xValue = row.get(1);
String xValue = String.valueOf(row.get(1));

//Find a xAxis value and register it in the xAxis_categories
if (!xAxis_categories.contains(xValue))
Expand Down
Loading

0 comments on commit bcdc02c

Please sign in to comment.