Docker run config modification

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index ae77cc075f05a4d82dfd98765fef512188505eba..c2f1a0dc9c7bee4a82fbb93e2e77115cac9d86f4 100644 (file)
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -24,6 +24,7 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
+        <option name="mapstruct.defaultComponentModel" value="spring" />
         <processorPath useClasspath="false">
           <entry name="$MAVEN_REPOSITORY$/org/mapstruct/mapstruct-processor/1.5.5.Final/mapstruct-processor-1.5.5.Final.jar" />
           <entry name="$MAVEN_REPOSITORY$/org/mapstruct/mapstruct/1.5.5.Final/mapstruct-1.5.5.Final.jar" />
@@ -40,12 +41,12 @@
   </component>
   <component name="JavacSettings">
     <option name="ADDITIONAL_OPTIONS_OVERRIDE">
-      <module name="lis" options="-parameters" />
-      <module name="lis-app" options="-parameters" />
-      <module name="lis-db" options="-parameters" />
-      <module name="lis-service" options="-parameters" />
-      <module name="lis-ui" options="-parameters" />
-      <module name="lis-workflow" options="-parameters" />
+      <module name="lis" options="-parameters -Amapstruct.defaultComponentModel=spring" />
+      <module name="lis-app" options="-parameters -Amapstruct.defaultComponentModel=spring" />
+      <module name="lis-db" options="-parameters -Amapstruct.defaultComponentModel=spring" />
+      <module name="lis-service" options="-parameters -Amapstruct.defaultComponentModel=spring" />
+      <module name="lis-ui" options="-parameters -Amapstruct.defaultComponentModel=spring" />
+      <module name="lis-workflow" options="-parameters -Amapstruct.defaultComponentModel=spring" />
     </option>
   </component>
 </project>
\ No newline at end of file

diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644 (file)
index ef24de5..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$/lis-services/lis-service.iml" filepath="$PROJECT_DIR$/lis-services/lis-service.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file

diff --git a/lis-db/migrations/environments/development.properties b/lis-db/migrations/environments/development.properties
index 8ca0d80651191b0f9b58cea7077eaca540e754c2..017b8c7c4db3b3c8f67438bc26397aa679764b16 100644 (file)
--- a/lis-db/migrations/environments/development.properties
+++ b/lis-db/migrations/environments/development.properties
@@ -4,7 +4,7 @@ time_zone=GMT+0:00
 script_char_set=UTF-8
 ## JDBC connection properties.
 driver=com.ibm.db2.jcc.DB2Driver
-url=jdbc:db2://localhost:50000/lis
+url=jdbc:db2://localhost:50000/slycrm
 username=db2admin
 password=password
 #

diff --git a/lis-db/src/main/java/hu/user/lis/db/repository/filter/InvoiceFilter.java b/lis-db/src/main/java/hu/user/lis/db/repository/filter/InvoiceFilter.java
index beaeae4ffafc50c7f5a19ffda5d350e75e946ef9..5afef129e12f0f7a580e0ebb02f1de17a343b369 100644 (file)
--- a/lis-db/src/main/java/hu/user/lis/db/repository/filter/InvoiceFilter.java
+++ b/lis-db/src/main/java/hu/user/lis/db/repository/filter/InvoiceFilter.java
@@ -2,13 +2,15 @@ package hu.user.lis.db.repository.filter;
 
 import hu.user.lis.db.Partner;
 import hu.user.lis.db.Project;
-import lombok.*;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
 
 import java.util.Date;
 
 @Getter
 @Setter
-@Builder
 @NoArgsConstructor
 @ToString
 public class InvoiceFilter extends PageableFilter {

diff --git a/lis-services/lis-service.iml b/lis-services/lis-service.iml
new file mode 100644 (file)
index 0000000..dd16b75
--- /dev/null
+++ b/lis-services/lis-service.iml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="SonarLintModuleSettings">
+    <option name="uniqueId" value="479a69b7-fe0e-4ae1-bea4-f9c9506ffaff" />
+  </component>
+</module>
\ No newline at end of file

diff --git a/runConfigurations/create-lis-db2-docker-container.run.xml b/runConfigurations/create-db2-docker-container.run.xml
similarity index 56%
rename from runConfigurations/create-lis-db2-docker-container.run.xml
rename to runConfigurations/create-db2-docker-container.run.xml
index 5af2441dba42898f3a03c4ab630df1f15bc89556..dbeaa973c7c2a28e7a34013be899cbf351f2f6cf 100644 (file)
--- a/runConfigurations/create-lis-db2-docker-container.run.xml
+++ b/runConfigurations/create-db2-docker-container.run.xml
@@ -1,23 +1,23 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="create-lis-db2-docker-container" type="docker-deploy" factoryName="docker-image" server-name="Docker">
+  <configuration default="false" name="create-db2-docker-container" type="docker-deploy" factoryName="docker-image" server-name="Docker">
     <deployment type="docker-image">
       <settings>
-        <option name="imageTag" value="icr.io/db2_community/db2:latest" />
+        <option name="imageTag" value="ibmcom/db2" />
         <option name="attachToContainerNeeded" value="true" />
-        <option name="containerName" value="lis" />
+        <option name="containerName" value="ibmdb2" />
         <option name="envVars">
           <list>
-            <DockerEnvVarImpl>
-              <option name="name" value="DB2INST1_PASSWORD" />
-              <option name="value" value="password" />
-            </DockerEnvVarImpl>
             <DockerEnvVarImpl>
               <option name="name" value="DB2INSTANCE" />
               <option name="value" value="db2admin" />
             </DockerEnvVarImpl>
+            <DockerEnvVarImpl>
+              <option name="name" value="DB2INST1_PASSWORD" />
+              <option name="value" value="password" />
+            </DockerEnvVarImpl>
             <DockerEnvVarImpl>
               <option name="name" value="DBNAME" />
-              <option name="value" value="lis" />
+              <option name="value" value="slycrm" />
             </DockerEnvVarImpl>
             <DockerEnvVarImpl>
               <option name="name" value="LICENSE" />
@@ -28,31 +28,7 @@
               <option name="value" value="false" />
             </DockerEnvVarImpl>
             <DockerEnvVarImpl>
-              <option name="name" value="BLU" />
-              <option name="value" value="false" />
-            </DockerEnvVarImpl>
-            <DockerEnvVarImpl>
-              <option name="name" value="ENABLE_ORACLE_COMPATIBILITY" />
-              <option name="value" value="false" />
-            </DockerEnvVarImpl>
-            <DockerEnvVarImpl>
-              <option name="name" value="UPDATEAVAIL" />
-              <option name="value" value="NO" />
-            </DockerEnvVarImpl>
-            <DockerEnvVarImpl>
-              <option name="name" value="TO_CREATE_SAMPLEDB" />
-              <option name="value" value="false" />
-            </DockerEnvVarImpl>
-            <DockerEnvVarImpl>
-              <option name="name" value="REPODB" />
-              <option name="value" value="false" />
-            </DockerEnvVarImpl>
-            <DockerEnvVarImpl>
-              <option name="name" value="IS_OSXFS" />
-              <option name="value" value="false" />
-            </DockerEnvVarImpl>
-            <DockerEnvVarImpl>
-              <option name="name" value="HADR_ENABLED" />
+              <option name="name" value="ARCHIVE_LOGS" />
               <option name="value" value="false" />
             </DockerEnvVarImpl>
           </list>
@@ -71,7 +47,7 @@
           <list>
             <DockerVolumeBindingImpl>
               <option name="containerPath" value="/database" />
-              <option name="hostPath" value="/lis-docker-db2" />
+              <option name="hostPath" value="/docker/ibmdb2" />
             </DockerVolumeBindingImpl>
           </list>
         </option>