changed logging

Author: phasenraum2010

src/main/java/org/woehlke/learn/learnneo4j/configuration/properties/SpringAppProperties.java

@@ -37,20 +37,29 @@ public class SpringAppProperties {
     public static class Datasource {
 
         @NotNull
-        private String driverClassName;
+        private String url;
 
         @NotNull
-        private String platform;
+        private String driverClassName;
 
         @NotNull
-        private String url;
+        private String platform;
 
         @NotNull
         private Boolean continueOnError;
 
         @NotNull
         private String schema;
 
+        @NotNull
+        private Boolean generateUniqueName;
+
+        @NotNull
+        private String name;
+
+        @NotNull
+        private String type;
+
         public String getDriverClassName() {
             return driverClassName;
         }
@@ -90,6 +99,44 @@ public String getSchema() {
         public void setSchema(String schema) {
             this.schema = schema;
         }
+
+        public Boolean getGenerateUniqueName() {
+            return generateUniqueName;
+        }
+
+        public void setGenerateUniqueName(Boolean generateUniqueName) {
+            this.generateUniqueName = generateUniqueName;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public String getType() {
+            return type;
+        }
+
+        public void setType(String type) {
+            this.type = type;
+        }
+
+        @Override
+        public String toString() {
+            return "Datasource{" +
+                "url='" + url + '\'' +
+                ", driverClassName='" + driverClassName + '\'' +
+                ", platform='" + platform + '\'' +
+                ", continueOnError=" + continueOnError +
+                ", schema='" + schema + '\'' +
+                ", generateUniqueName=" + generateUniqueName +
+                ", name='" + name + '\'' +
+                ", type='" + type + '\'' +
+                '}';
+        }
     }
 
     @Validated
@@ -144,6 +191,13 @@ public String getDialect() {
                 public void setDialect(String dialect) {
                     this.dialect = dialect;
                 }
+
+                @Override
+                public String toString() {
+                    return "Hibernate{" +
+                        "dialect='" + dialect + '\'' +
+                        '}';
+                }
             }
 
             public Hibernate getHibernate() {
@@ -154,6 +208,12 @@ public void setHibernate(Hibernate hibernate) {
                 this.hibernate = hibernate;
             }
 
+            @Override
+            public String toString() {
+                return "Properties{" +
+                    "hibernate=" + hibernate +
+                    '}';
+            }
         }
 
         public Hibernate getHibernate() {
@@ -196,6 +256,16 @@ public void setOpenInView(Boolean openInView) {
             this.openInView = openInView;
         }
 
+        @Override
+        public String toString() {
+            return "Jpa{" +
+                "generateDdl=" + generateDdl +
+                ", showSql=" + showSql +
+                ", openInView=" + openInView +
+                ", hibernate=" + hibernate +
+                ", properties=" + properties +
+                '}';
+        }
     }
 
     @Validated
@@ -226,6 +296,13 @@ public Boolean getEnabled() {
                 public void setEnabled(Boolean enabled) {
                     this.enabled = enabled;
                 }
+
+                @Override
+                public String toString() {
+                    return "Initializer{" +
+                        "enabled=" + enabled +
+                        '}';
+                }
             }
 
             public Initializer getInitializer() {
@@ -235,6 +312,13 @@ public Initializer getInitializer() {
             public void setInitializer(Initializer initializer) {
                 this.initializer = initializer;
             }
+
+            @Override
+            public String toString() {
+                return "Jdbc{" +
+                    "initializer=" + initializer +
+                    '}';
+            }
         }
 
         public String getStoreType() {
@@ -252,6 +336,14 @@ public Jdbc getJdbc() {
         public void setJdbc(Jdbc jdbc) {
             this.jdbc = jdbc;
         }
+
+        @Override
+        public String toString() {
+            return "Session{" +
+                "storeType='" + storeType + '\'' +
+                ", jdbc=" + jdbc +
+                '}';
+        }
     }
 
     @Validated
@@ -267,6 +359,13 @@ public Boolean getCache() {
         public void setCache(Boolean cache) {
             this.cache = cache;
         }
+
+        @Override
+        public String toString() {
+            return "Template{" +
+                "cache=" + cache +
+                '}';
+        }
     }
 
     @Validated
@@ -282,6 +381,13 @@ public Boolean getCache() {
         public void setCache(Boolean cache) {
             this.cache = cache;
         }
+
+        @Override
+        public String toString() {
+            return "Thymeleaf{" +
+                "cache=" + cache +
+                '}';
+        }
     }
 
     public Datasource getDatasource() {
@@ -332,8 +438,20 @@ public void setProfiles(String profiles) {
         this.profiles = profiles;
     }
 
+
     @Override
     public String toString() {
+        return "SpringAppProperties{" +
+            "profiles='" + profiles + '\'' +
+            ", datasource=" + datasource +
+            ", jpa=" + jpa +
+            ", session=" + session +
+            ", template=" + template +
+            ", thymeleaf=" + thymeleaf +
+            '}';
+    }
+
+    public String toString2() {
         List<String> outputLines = new ArrayList<>();
         outputLines.add("spring.profiles =                                     "+this.getProfiles());
         outputLines.add("spring.template.cache =                               "+this.getTemplate().getCache());

src/main/java/org/woehlke/learn/learnneo4j/model/graph/maintainer/MaintainerServiceImpl.java

@@ -7,7 +7,6 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.woehlke.learn.learnneo4j.model.graph.Maintainer;
 import org.woehlke.learn.learnneo4j.model.common.Neo4jServiceImpl;
-import org.woehlke.learn.learnneo4j.model.graph.platform.PlatformServiceImpl;
 
 @Service
 @Transactional

src/main/java/org/woehlke/learn/learnneo4j/model/graph/port/PortServiceImpl.java

@@ -12,7 +12,6 @@
 import org.woehlke.learn.learnneo4j.model.graph.license.LicenseRepository;
 import org.woehlke.learn.learnneo4j.model.graph.maintainer.MaintainerRepository;
 import org.woehlke.learn.learnneo4j.model.graph.platform.PlatformRepository;
-import org.woehlke.learn.learnneo4j.model.graph.variant.VariantServiceImpl;
 
 @Service
 @Transactional

src/main/java/org/woehlke/learn/learnneo4j/model/graph/variant/VariantServiceImpl.java

@@ -5,7 +5,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.woehlke.learn.learnneo4j.frontend.control.open.home.WelcomeServiceImpl;
 import org.woehlke.learn.learnneo4j.model.graph.Variant;
 import org.woehlke.learn.learnneo4j.model.common.Neo4jServiceImpl;
 

src/main/resources/application.yml

@@ -1,4 +1,39 @@
+endpoints:
+  env:
+    - keys-to-sanitize: "password"
+    - keys-to-sanitize: "secret"
+    - keys-to-sanitize: "key"
+    - keys-to-sanitize: "passwort"
+  health:
+    sensitive: false
+  endpoints:
+    shutdown:
+      enabled: false
+server:
+  error:
+    path: /fehler
+  compression:
+    enabled: true
+    min-response-size: 2048
+hibernate:
+  dialect: org.hibernate.dialect.PostgreSQL94Dialect
+info:
+  application:
+    artifactId: @project.artifactId@
+    description: @project.description@
+    groupId: @project.groupId@
+    name: @project.name@
+    version: @project.version@
+management:
+  address: 127.0.0.1
+  context-path: "/manage"
+  security:
+    enabled: true
 spring:
+  application:
+      admin:
+        enabled: false
+      name: @project.name@
   data:
     neo4j:
       open-in-view: true
@@ -18,29 +53,40 @@ spring:
   dao:
     exceptiontranslation:
       enabled: true
+  datasource:
+    url: 'jdbc:postgresql://localhost:5432/learn-neo4j?user=jdbc&password=jdbcpwd'
+    # username: jdbc
+    # password: jdbcpwd
+    driver-class-name: org.postgresql.Driver
+    generate-unique-name: true
+    continue-on-error: true
+    schema: classpath:org/springframework/session/jdbc/schema-postgresql.sql
+    #name: Learnneo4jDS
+    #type: com.zaxxer.hikari.HikariDataSource
+    platform: POSTGRESQL
+    tomcat:
+      max-active: 20
   jpa:
       database-platform: org.hibernate.dialect.PostgreSQL95Dialect
       hibernate:
         ddl-auto: create-drop
       properties:
         hibernate:
+          dialect: org.hibernate.dialect.PostgreSQL94Dialect
           globally_quoted_identifiers: true
           temp:
             use_jdbc_metadata_defaults: false
       open-in-view: true
       generate-ddl: true
       show-sql: true
-  datasource:
-    url: "jdbc:postgresql://localhost:5432/learn-neo4j"
-    username: jdbc
-    password: jdbcpwd
-    driver-class-name: org.postgresql.Driver
-    generate-unique-name: true
-    continue-on-error: true
-    schema: public
-    name: Learnneo4jDS
-    type: org.postgresql.jdbc3.Jdbc3PoolingDataSource
-    platform: POSTGRESQL
+  session:
+      store-type: jdbc
+      jdbc:
+        initializer:
+          enabled: true
+  devtools:
+      livereload:
+        enabled: true
   template:
     cache: false
   thymeleaf:
@@ -51,7 +97,6 @@ org:
   woehlke:
     learn:
       learnneo4j:
-          pageSize: 30
           loginUsername: tw
           loginPassword: blablabla
           filesystemWorkdir: ports
@@ -79,10 +124,41 @@ spring:
 ---
 spring:
   profiles: travis
+logging:
+  config: classpath:logback-travis.xml
+  file: logging-travis.log
 ---
 spring:
-  profiles: smoketests
+  profiles: alltests
+logging:
+  config: classpath:logback-alltests.xml
+  file: logging-alltests.log
 ---
 spring:
-  profiles: alltests
+  profiles: smoketests
+logging:
+  config: classpath:logback-smoketests.xml
+  file: logging-smoketests.log
+  level:
+    org:
+      woehlke:
+        learn:
+          learnneo4j:
+            middleware: DEBUG
+            model:
+              orm:
+                portinfo: DEBUG
+              graph:
+                category: DEBUG
+                license: DEBUG
+                maintainer: DEBUG
+                platform: DEBUG
+                port: DEBUG
+                variant: DEBUG
+            frontend:
+              control:
+                closed:
+                  terminal: DEBUG
+                open:
+                  home: DEBUG
 

src/test/resources/logback-alltests.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <include resource="org/springframework/boot/logging/logback/base.xml"/>
+  <logger name="org.apache.http" level="INFO" />
+  <logger name="org.apache.tomcat" level="INFO" />
+  <logger name="org.springframework.boot" level="WARN" />
+  <logger name="org.springframework.test" level="DEBUG" />
+  <logger name="org.hibernate" level="INFO" />
+  <logger name="ch.qos.logback" level="INFO" />
+  <logger name="org.hibernate.SQL" level="DEBUG" />
+  <logger name="org.woehlke.learn.learnneo4j" level="DEBUG" />
+  <root level="INFO"></root>
+</configuration>