Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dal dev #16

Merged
merged 10 commits into from
Jun 12, 2020
+156 −202
Merged

Dal dev #16

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
aae623e
DAL-dev CRUD 1st
Stratidakos Jun 10, 2020
8c91cfe
DAL-dev CRUD 2nd
Stratidakos Jun 11, 2020
4c1e9a7
DAL-dev CRUD 3rd
Stratidakos Jun 12, 2020
fad238a
fix connection info
OrfenCLMS Jun 12, 2020
0ed3eb3
no changes
OrfenCLMS Jun 12, 2020
7de9eaa
Delete typhon-polystore-api.iml
OrfenCLMS Jun 12, 2020
4e94c53
remove unnecessary dependencies
OrfenCLMS Jun 12, 2020
7e17c7c
Delete SwaggerJsonConfiguration.java
OrfenCLMS Jun 12, 2020
67dc644
Delete pom.xml
OrfenCLMS Jun 12, 2020
8881c9f
restore master files
Orfen-0 Jun 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
restore master files
@Orfen-0
Orfen-0 committed Jun 12, 2020
commit 8881c9f88c89c1d1f248cce534901996b056783d
211 changes: 211 additions & 0 deletions com.clms.typhonapi/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,211 @@
<?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>

<groupId>org.springframework</groupId>
<artifactId>typhon-polystore-api</artifactId>
<version>0.1.0</version>

<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.5.RELEASE</version>
</parent>
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>2.0.0-alpha1</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-log4j12 -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>2.0.0-alpha0</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>2.0.1.Final</version>
</dependency>
<dependency>
<groupId>typhon</groupId>
<artifactId>ac.york.typhon.analytics</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-rest</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
<exclusions>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</exclusion>
</exclusions>
</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-data-mongodb</artifactId>
<version>2.2.4.RELEASE</version>
<exclusions>
<exclusion>
<groupId>org.mongodb</groupId>
<artifactId>mongodb-driver</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<!-- override the bootstrap version -->
<groupId>org.mongodb</groupId>
<artifactId>mongodb-driver</artifactId>
<version>3.12.0</version>
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongodb-driver-core</artifactId>
<version>3.12.0</version>
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>bson</artifactId>
<version>3.12.0</version>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.10.2</version>
</dependency>
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
<version>2.4.1</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<version>2.8.0</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
<version>2.8.0</version>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka_2.12</artifactId>
<version>2.2.1</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.flink/flink-core -->
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-core</artifactId>
<version>1.8.0</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jsr310 -->
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>2.9.9</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<version>2.9.2</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
<version>2.9.2</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.google.code.gson/gson -->
<!-- https://mvnrepository.com/artifact/net.sf.jsqlparser/jsqlparser -->
<dependency>
<groupId>net.sf.jsqlparser</groupId>
<artifactId>jsqlparser</artifactId>
<version>0.8.0</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>

</dependency>
</dependencies>

<properties>
<java.version>1.8</java.version>
</properties>


<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
<version>1.8.0</version>
<configuration>
<container>
<creationTime>USE_CURRENT_TIMESTAMP</creationTime>
</container>
<from>
<image>docker.io/clms/polystore-base</image>
</from>
<to>
<image>docker.io/clms/typhon-polystore-api</image>
</to>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>2.4.0</version>
<extensions>true</extensions>
</plugin>
</plugins>
<resources>
<resource>
<directory>src/main/resources</directory>
<targetPath>${project.build.outputDirectory}</targetPath>
<includes>
<include>swagger.json</include>
<include>application.properties</include>
</includes>
</resource>
</resources>
</build>

<repositories>
<repository>
<id>internal</id>
<url>http://archiva.clmsuk.com:8090/repository/internal/</url>
</repository>
<repository>
<id>spring-releases</id>
<url>https://repo.spring.io/libs-release</url>
</repository>
</repositories>

<pluginRepositories>
<pluginRepository>
<id>spring-releases</id>
<url>https://repo.spring.io/libs-release</url>
</pluginRepository>
</pluginRepositories>
</project>
94 changes: 94 additions & 0 deletions com.clms.typhonapi/src/main/java/com/clms/typhonapi/config/SwaggerJsonConfiguration.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
package com.clms.typhonapi.config;

import java.io.BufferedReader;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.LinkedHashSet;
import java.util.Set;

import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.io.ResourceLoader;

/**
* {@code SwaggerJsonConfiguration} is responsible for reading the swagger.json
* file for classpath or file sytstem.
* <p/>
*
* @author Indra Basak
* @since 11/23/17
*/
@Configuration
public class SwaggerJsonConfiguration {

@Bean
public SwaggerJson swaggerConfiguration(
@Value("app/resources/swagger.json") String location,
@Qualifier("webApplicationContext") ResourceLoader loader) throws IOException {

InputStream istream = getResource(location, loader);
if (istream == null) {
throw new FileNotFoundException(
"Scope configuration file " + location + " not found.");
}

StringBuilder builder = new StringBuilder();
try (BufferedReader bufferedReader
= new BufferedReader(new InputStreamReader(istream))) {
String line;
while ((line = bufferedReader.readLine()) != null) {
builder.append(line).append("\n");
}
}
String json = builder.toString();

SwaggerJson swaggerJson = new SwaggerJson();
swaggerJson.setJson(json);

return swaggerJson;
}

/**
* Looks for a resource at different locations in order of preference.
*
* @param location location of the resourcve
* @param loader the resource loader
* @return input stream of the resource, null if not found
*/
private InputStream getResource(String location, ResourceLoader loader) {

InputStream istream = null;
try {
istream = loader.getResource(location).getInputStream();
} catch (IOException e) {
System.out.println("Searching for swagger JSON. Not found in " + location);
}

if (istream == null) {
Set<String> schemes = new LinkedHashSet<>();
schemes.add("file:./config/");
schemes.add("file:./");
schemes.add("classpath:/config/");
schemes.add("classpath:/");
for (String scheme : schemes) {
try {
istream =
loader.getResource(
scheme + location).getInputStream();
} catch (IOException e) {
System.out.println(
"Searching for swagger JSON. Not found in " + scheme);
}
if (istream != null) {
return istream;
}
}
}

return null;
}
}
2 changes: 2 additions & 0 deletions com.clms.typhonapi/src/main/resources/application.properties
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
spring.data.mongodb.uri= mongodb://admin:admin@polystore-mongo:27017/admin
spring.data.mongodb.repositories.enabled=true