From bf612e45b76fce5444faaa257112a1e684497c29 Mon Sep 17 00:00:00 2001
From: emtunhei <emtunhei@stud.ntnu.no>
Date: Thu, 17 Feb 2022 11:39:15 +0100
Subject: [PATCH] Changed project structure to maven and imported biquerry lib
---
.idea/.gitignore | 4 +--
.idea/codeStyles/codeStyleConfig.xml | 5 ----
.idea/compiler.xml | 13 ++++++++++
.idea/description.html | 1 -
.idea/encodings.xml | 6 -----
.idea/jarRepositories.xml | 20 +++++++++++++++
.idea/libraries/lib.xml | 13 ----------
.idea/misc.xml | 12 +++++----
.idea/modules.xml | 8 ------
.idea/project-template.xml | 3 ---
.idea/vcs.xml | 6 -----
application.iml | 17 -------------
.../application/com/application/Main.class | Bin 1373 -> 0 bytes
.../application/com/application/test.class | Bin 269 -> 0 bytes
.../application/com/application/test.class | Bin 269 -> 0 bytes
pom.xml | 24 ++++++++++++++++++
src/main/java/com/application/Main.java | 2 +-
src/test/java/com/application/test.java | 6 -----
target/classes/com/application/Main.class | Bin 0 -> 2252 bytes
19 files changed, 67 insertions(+), 73 deletions(-)
delete mode 100644 .idea/codeStyles/codeStyleConfig.xml
create mode 100644 .idea/compiler.xml
delete mode 100644 .idea/description.html
delete mode 100644 .idea/encodings.xml
create mode 100644 .idea/jarRepositories.xml
delete mode 100644 .idea/libraries/lib.xml
delete mode 100644 .idea/modules.xml
delete mode 100644 .idea/project-template.xml
delete mode 100644 .idea/vcs.xml
delete mode 100644 application.iml
delete mode 100644 out/production/application/com/application/Main.class
delete mode 100644 out/production/application/com/application/test.class
delete mode 100644 out/test/application/com/application/test.class
create mode 100644 pom.xml
delete mode 100644 src/test/java/com/application/test.java
create mode 100644 target/classes/com/application/Main.class
diff --git a/.idea/.gitignore b/.idea/.gitignore
index 73f69e0..13566b8 100644
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -1,8 +1,8 @@
# Default ignored files
/shelf/
/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml
-# Editor-based HTTP Client requests
-/httpRequests/
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
- <state>
- <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
- </state>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..f46b06d
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="CompilerConfiguration">
+ <annotationProcessing>
+ <profile name="Maven default annotation processors profile" enabled="true">
+ <sourceOutputDir name="target/generated-sources/annotations" />
+ <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+ <outputRelativeToContentRoot value="true" />
+ <module name="Bachelor_application" />
+ </profile>
+ </annotationProcessing>
+ </component>
+</project>
\ No newline at end of file
diff --git a/.idea/description.html b/.idea/description.html
deleted file mode 100644
index db5f129..0000000
--- a/.idea/description.html
+++ /dev/null
@@ -1 +0,0 @@
-<html>Simple <b>Java</b> application that includes a class with <code>main()</code> method</html>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index 97626ba..0000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="Encoding">
- <file url="PROJECT" charset="UTF-8" />
- </component>
-</project>
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..712ab9d
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="RemoteRepositoriesConfiguration">
+ <remote-repository>
+ <option name="id" value="central" />
+ <option name="name" value="Central Repository" />
+ <option name="url" value="https://repo.maven.apache.org/maven2" />
+ </remote-repository>
+ <remote-repository>
+ <option name="id" value="central" />
+ <option name="name" value="Maven Central repository" />
+ <option name="url" value="https://repo1.maven.org/maven2" />
+ </remote-repository>
+ <remote-repository>
+ <option name="id" value="jboss.community" />
+ <option name="name" value="JBoss Community repository" />
+ <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+ </remote-repository>
+ </component>
+</project>
\ No newline at end of file
diff --git a/.idea/libraries/lib.xml b/.idea/libraries/lib.xml
deleted file mode 100644
index b9b7733..0000000
--- a/.idea/libraries/lib.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
- <library name="lib">
- <CLASSES>
- <root url="file://C:/Program Files/Java/javafx-sdk-11.0.2/lib" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="file://C:/Program Files/Java/javafx-sdk-11.0.2/lib" />
- </SOURCES>
- <jarDirectory url="file://C:/Program Files/Java/javafx-sdk-11.0.2/lib" recursive="false" />
- <jarDirectory url="file://C:/Program Files/Java/javafx-sdk-11.0.2/lib" recursive="false" type="SOURCES" />
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 2fc6c34..132404b 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,10 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
- <component name="EntryPointsManager">
- <entry_points version="2.0" />
- </component>
- <component name="ProjectKey">
- <option name="state" value="project://e2804f05-5315-4fc6-a121-c522a6c26470" />
+ <component name="ExternalStorageConfigurationManager" enabled="true" />
+ <component name="MavenProjectsManager">
+ <option name="originalFiles">
+ <list>
+ <option value="$PROJECT_DIR$/pom.xml" />
+ </list>
+ </option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 4f89f92..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="ProjectModuleManager">
- <modules>
- <module fileurl="file://$PROJECT_DIR$/application.iml" filepath="$PROJECT_DIR$/application.iml" />
- </modules>
- </component>
-</project>
\ No newline at end of file
diff --git a/.idea/project-template.xml b/.idea/project-template.xml
deleted file mode 100644
index 1f08b88..0000000
--- a/.idea/project-template.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<template>
- <input-field default="com.company">IJ_BASE_PACKAGE</input-field>
-</template>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 35eb1dd..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="VcsDirectoryMappings">
- <mapping directory="" vcs="Git" />
- </component>
-</project>
\ No newline at end of file
diff --git a/application.iml b/application.iml
deleted file mode 100644
index 07e32b1..0000000
--- a/application.iml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="false" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="lib" level="project" />
- </component>
-</module>
\ No newline at end of file
diff --git a/out/production/application/com/application/Main.class b/out/production/application/com/application/Main.class
deleted file mode 100644
index 69464d6cacee835015977a22051d0cfae76de51e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1373
zcmX^0Z`VEs1_l#`U@iu62170eF$N<J24gM;69!Xu1~V=ORt7^(1~CS64h9Pl$C91F
zii?2@q>_ulnw!Cf!IquDj?JOy00RiHIpjNlXa+6@J_dV`DGngQk)6Sboxz!rfi0=D
zq$EF&kwMlcE3qswtwO&zIW;d;KRG|Iq$oc}-w7;j&B(xJlbM%UV#mn9tf3jk$iU*9
zpOVVR!0(fpm+DuVo0M7<l9-f}%E%z(lb@WJ6P8$%3F1QqSxPc8iy0Zje3J8X^%DyU
zax#+>OEUBG^nDXE^Q;*eSaK6H^B5V#G@`+-(9cQCOV<xBDay=Cw+7pmSd?DO$RLbG
znvsFExFoTtgpom91FRY3g_6YdRQ+HO3D(Y2P?VXQSX2oXVPp`&rjC(;Ehn)uzqEvr
zK^`s-4ho1c$hhR}fW*91Ymk*78Dx_{eEnb$Y0b#M<yw)PS^)B3F*}0`BLi1(erZv1
zs#_)~fH*;Z)&m7L4}%ngG!KI-gAyZyly81&PFZT6f=f|lW?s62BO;L48Qgdn+!;I=
z8KgnFK>h>SgBC?R3=#~Ij0_ykIho1X3c0B~44xn@vM5^6y~4xb#o*1(;KRe<%izbz
zAcUeA>>H39{dpJy7y@}1f*7P38APx}AtQqvR4a1iBKd)lK^UX}60z{m0f%{MUUCMK
z)u2cNg>`x=BLhcqYDq|D2`JP=A(0C)04Zg#gOsFJlrS=Ir>B-UXJqE26s6`dGN@{3
z!eTKwKPM+O85|q>{z=8DMP;Cr>62MpV$H~)2y#|hg+6XYj10_)DJhH$C@%0%%1TWx
zvDS=YWRQZm3?3~3iAAY-CDtx3po9zZ0XQ5{k|#L&z{23<$x@t=U(TS&AjTlhz`(%B
zzyOL$1_lOZ21ZZ{VPIsCVPIg;XJ7=&v1)B+VBE;Sz`(>H%fP_E1{UOGkYiwA-~qE)
z8RQuh7#J8h859|mpqh>0ns+cTAvAL_FflMN@G`J4@Szx>%%B2xi7JB{0~6TxjSTDz
zEDQ_`p4vjp+Zb51b~CU>Zf9WI%D}F*g@Ij&V;ckKZU(N%?F`($I@=g{K!Q6Nc$pZ&
zcQf!s>WDD#i!caoXAt(&*4@S+qP>kl6yXRp22KVB25AO11~~>n26+Z41|<e124w~V
z22}=o1~mp326YAx22HR7wIGgw`jCOalR=$9gMpDji9ww~lR=AtiNT(Mi$R+~hk=<v
Umw|zSg@KVlkAaav9~@o=0HohR6951J
diff --git a/out/production/application/com/application/test.class b/out/production/application/com/application/test.class
deleted file mode 100644
index 8052a9b849a81e5b25de3f82573210073dd7b707..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 269
zcmX^0Z`VEs1_l!b0WJn+23~dsK6VCvMg}&U%)HDJJ4Oa(4b3n{1{UZ1lvG9rexJ;|
zRKL>Pq|~C2#H5^5Mg}3D{N%)(u*9NF5FaYYQj(Eb%*Y_-lboNcpIA_klbM`Yl9`{U
zUy@o}V$I0F6`WsMl$`382{M5bB&e5_SeD4cz{0@F$RL7E7bAlJNQr(<VqUtwe^ORz
zatVVX0}}%?0|+oOFoN_lFfy<)FfiydfcOjytXkU{7&kI7FfcK&GcYi)F)%VPFfcQ4
YFfcIifZ41JoD5tH3=E76++bBa0E*!^fdBvi
diff --git a/out/test/application/com/application/test.class b/out/test/application/com/application/test.class
deleted file mode 100644
index 8052a9b849a81e5b25de3f82573210073dd7b707..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 269
zcmX^0Z`VEs1_l!b0WJn+23~dsK6VCvMg}&U%)HDJJ4Oa(4b3n{1{UZ1lvG9rexJ;|
zRKL>Pq|~C2#H5^5Mg}3D{N%)(u*9NF5FaYYQj(Eb%*Y_-lboNcpIA_klbM`Yl9`{U
zUy@o}V$I0F6`WsMl$`382{M5bB&e5_SeD4cz{0@F$RL7E7bAlJNQr(<VqUtwe^ORz
zatVVX0}}%?0|+oOFoN_lFfy<)FfiydfcOjytXkU{7&kI7FfcK&GcYi)F)%VPFfcQ4
YFfcIifZ41JoD5tH3=E76++bBa0E*!^fdBvi
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..491ab97
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,24 @@
+<?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.example</groupId>
+ <artifactId>Bachelor_application</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>com.google.cloud</groupId>
+ <artifactId>google-cloud-bigqueryconnection</artifactId>
+ <version>2.1.10</version>
+ </dependency>
+ </dependencies>
+
+ <properties>
+ <maven.compiler.source>8</maven.compiler.source>
+ <maven.compiler.target>8</maven.compiler.target>
+ </properties>
+
+</project>
\ No newline at end of file
diff --git a/src/main/java/com/application/Main.java b/src/main/java/com/application/Main.java
index 3c4e841..aeeaadf 100644
--- a/src/main/java/com/application/Main.java
+++ b/src/main/java/com/application/Main.java
@@ -38,6 +38,6 @@ public class Main extends Application {
Scene scene = new Scene(layout, 300, 250);
primaryStage.setScene(scene);
primaryStage.show();
-
}
}
+
diff --git a/src/test/java/com/application/test.java b/src/test/java/com/application/test.java
deleted file mode 100644
index b4eea50..0000000
--- a/src/test/java/com/application/test.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.application;
-
-public class test
-{
-
-}
diff --git a/target/classes/com/application/Main.class b/target/classes/com/application/Main.class
new file mode 100644
index 0000000000000000000000000000000000000000..df1fc0cf8c2acaa89640bbfb70fa972a1c245e31
GIT binary patch
literal 2252
zcmX^0Z`VEs1_l#`1}+8}1}iQGX$ET!1{*F0TLwFJ274|BRt76h25ANd4hBaM$4Q8R
zfx!dB@?>Z5;$q+d>EU7U=4S9=@MUN4V{<4vzyJbl4*3osnt_W!fWaSRUI2&)<YWk9
z2<Bi2;bI772xDgmXJ?3DWME4wEh)**V`Px^$x19sOsmi@PEO5B)lbgPD=Es)(RTt%
zTQf4S*<|Krme?^eFl%UrF*2|?=clAHGVuFk=B4_T<|d^Ug(N2Bq%txH`Q#@j=7c2{
zWrFxnL6(w?%wk3cF`wl8T>Zp?f}G6c#FEVXJbmB9%sgvG2A15!%sfU0F^y=jEA(>`
z^V0Q$ONuh{(yhU^B^IR@GcpKck!ECIEiOqcDq&<0*8pn<d7&gRJyky#M1r;R6clCV
zCKgqKMHm@Gu&HBYV9QCY%r7lrWRQo;gM$Jh3^Fb`J0LMH)f!|aNCw#?5MMtSL|QX4
zaJg0_rxt)bSj^54$;iN$lbD;7lBfc9sEPq2gDl*ssb#5oCHjuZAjPgAHrT<8sf-L#
zFjrtIVPxP6&Mz%WPIb!!1vw`u6!k#S$HO4cpuocr#h}i}Amy8%np2jVr{GdlnVFZa
z;D`uzc7|vkh8TueMh0n+E>MVpT#gp$JPfi7a*PZd&N-RM*$TO-JPdIlEdoyY`6b0A
zMTrHzsU;ctDaHJ34DkXC3H)pfi2@9!JPb(;$vg}x45^F^vM8pbha(R|8bdleLk15+
zCPNk@gAj^ha8QE0lg-1B!;s6vkjJ3F&XCW;P{2^g$RGqsmI~#G#R|zF=cT5wGZgVK
z6oVWnf-R9TGRQ&AM^1i7VZz8D3{n6|dhqxIr;5_N<P0SDfsz#{HKeC9GH?{9mV{)M
zfMP)u5~mOYkkT$YNJ(l%2^T{NLn(49g~Tf?(n0yZjFEvYBQY-pWSp#qCTaozEA#-%
z7Fjbga2KbR_~$_q4kLpc#PYNXeI!$1ia|MuJ3Y0;IU_SCr6@IzkwFz<cyfMDPAWM0
z73=#a6{i-Jf%2_SW^su%BZDF+NYX0waVuhEU`|X)VPrt@y?;_xYI2FSW)vfX6x?Bu
zawQ<KC^fId+QkLrC{XBuBN{naAnL%v;Jm<6oRMG7$RGf63N&yli%U{-85x+txm6S#
zO!}Gm`T<3mc_qOmMX8Co*0AVA6=q~$F90dZ$zx|I=V7Q|sNrESVK8N6P(qlVnOByd
zovQBx&a%F#C5dT?$tC$km5dDBxd<LRLmeXnn@@gzc4+}41CM83UTTqZPGWI!YB3|j
z8HlGLu7#Qh$t;j4DOQ1Kw1zkxxwJzPLD3jeS&)jXoOnrymH72Sk{XJ8ofC6%f-_4}
zt=Sps85vYD!UvmwpqUKC929j7iVV^WG7Jn1j0_B*(uIM6frWt)RA@0UGAJ@IFz7Qd
zg5_AXwlgqpWME)mVo+jWU|<6aaxy40Ffj0d*{lpI45|za44e#V4C+wL#&FF$7?=>6
zxfqxj7#MgNSQz+F4A5ZE1iM6wL7RaIZ2Lh5b_Ny(28K{=A?9riELyu6SR=PHux({v
z*V@9sF2u2offK~o#lXeDu#JIxHv>=Pb_QNwoox(!An~0H{7ektyBP!`bwn5hMHqy)
zGl=?W>uzHZ)857)j&P6`NI!!#0~>=JgCK)EgA{`TgBpV}gC2tlgAIckgExaZLjZ#Y
zLkNQ=*uh#5M?rnez!1uy!=TH+$e_od&Y;Jj&%ngs&A`QAz+lM0%wPl!Qey!wP|Ajf
z3==riI5#m!2uW^ZkU}^H60{0niy%SE$zaA{&cMLH%wPeI0855y1_lN$21bTThFXRy
U21y2IXf(JmFf+I^xG}f`05GycTL1t6
literal 0
HcmV?d00001
--
GitLab