Compare revisions

92257938 · c65cfb6c · c65cfb6c · c65cfb6c · 92257938 · 92257938
--- a/src/main/java/org/springframework/samples/petclinic/repository/VisitRepository.java
+++ b/src/main/java/org/springframework/samples/petclinic/repository/VisitRepository.java
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,24 +13,25 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.springframework.samples.petclinic.repository;
+package org.springframework.samples.petclinic.visit;

 import java.util.List;

 import org.springframework.dao.DataAccessException;
+import org.springframework.data.repository.Repository;
 import org.springframework.samples.petclinic.model.BaseEntity;
-import org.springframework.samples.petclinic.model.Visit;

 /**
 * Repository class for <code>Visit</code> domain objects All method names are compliant with Spring Data naming
- * conventions so this interface can easily be extended for Spring Data See here: http://static.springsource.org/spring-data/jpa/docs/current/reference/html/jpa.repositories.html#jpa.query-methods.query-creation
+ * conventions so this interface can easily be extended for Spring Data.
+ * See: https://docs.spring.io/spring-data/jpa/docs/current/reference/html/#repositories.query-methods.query-creation
 *
 * @author Ken Krebs
 * @author Juergen Hoeller
 * @author Sam Brannen
 * @author Michael Isvy
 */
-public interface VisitRepository {
+public interface VisitRepository extends Repository<Visit, Integer> {

    /**
     * Save a <code>Visit</code> to the data store, either inserting or updating it.

--- a/src/main/java/org/springframework/samples/petclinic/web/package-info.java
+++ b/src/main/java/org/springframework/samples/petclinic/web/package-info.java
-/**
- * The classes in this package represent PetClinic's web presentation layer.
- */
-package org.springframework.samples.petclinic.web;
-
--- a/src/main/java/overview.html
+++ b/src/main/java/overview.html
-<html>
-<body>
-<p>
-    The Spring Data Binding framework, an internal library used by Spring Web Flow.
-</p>
-</body>
-</html>
\ No newline at end of file
--- a/src/main/java/test.html
+++ b/src/main/java/test.html
-<head>
-    <style type="text/css">
-        table.speakersTable {
-            width: 70%;
-            padding: 10;
-            spacing: 10;
-        }
-
-        img.speakerPic {
-            float: right;
-            padding: 10;
-            width: 90;
-        }
-    </style>
-</head>
-
-<h1>Organisation</h1>
-
-<h1>Speakers</h1>
-<table class="speakersTable">
-    <tbody>
-    <tr>
-        <td>
-            <img class="speakerPic" alt="Sergiu Bodiu"
-                 src="http://m.c.lnkd.licdn.com/mpr/mpr/shrink_200_200/p/4/000/16a/2ba/0ba653e.jpg"/>
-
-            <h2>Sergiu Bodiu </h2>
-
-            <h3> Java Consultant at Bank of America </h3>
-            <font size="5">S</font>easoned consultant experienced in large-scale e-commerce projects, passionate about
-            providing innovative technology solutions to solve complex business problems, have extensive knowledge and
-            experience delivering enterprise wide applications. He is skilled in software design, data modeling,
-            stakeholder management, IT strategic planning, technical know-how and security. Able to design, implement,
-            test and maintain software product components with strong focus on design elegance and software reuse.
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <img alt="Sergiu Bodiu" src="http://m.c.lnkd.licdn.com/mpr/mpr/shrink_200_200/p/4/000/16a/2ba/0ba653e.jpg"
-                 width="84" height="84" align="right" hspace="10"/>
-
-            <h2>Sergiu Bodiu </h2>
-
-            <h3> Java Consultant at Bank of America </h3>
-            <font size="5">S</font>easoned consultant experienced in large-scale e-commerce projects, passionate about
-            providing innovative technology solutions to solve complex business problems, have extensive knowledge and
-            experience delivering enterprise wide applications. He is skilled in software design, data modeling,
-            stakeholder management, IT strategic planning, technical know-how and security. Able to design, implement,
-            test and maintain software product components with strong focus on design elegance and software reuse.
-        </td>
-    </tr>
-    </tbody>
-</table>
--- a/src/main/less/header.less
+++ b/src/main/less/header.less
+.navbar {
+  border-top: 4px solid #6db33f;
+  background-color: #34302d;
+  margin-bottom: 0px;
+  border-bottom: 0;
+  border-left: 0;
+  border-right: 0;
+}
+
+.navbar a.navbar-brand {
+  background: url("../images/spring-logo-dataflow.png") -1px -1px no-repeat;
+  margin: 12px 0 6px;
+  width: 229px;
+  height: 46px;
+  display: inline-block;
+  text-decoration: none;
+  padding: 0;
+}
+
+.navbar a.navbar-brand span {
+  display: block;
+  width: 229px;
+  height: 46px;
+  background: url("../images/spring-logo-dataflow.png") -1px -48px no-repeat;
+  opacity: 0;
+  -moz-transition: opacity 0.12s ease-in-out;
+  -webkit-transition: opacity 0.12s ease-in-out;
+  -o-transition: opacity 0.12s ease-in-out;
+}
+
+.navbar a:hover.navbar-brand span {
+  opacity: 1;
+}
+
+.navbar li > a, .navbar-text {
+  font-family: "montserratregular", sans-serif;
+  text-shadow: none;
+  font-size: 14px;
+
+/* line-height: 14px; */
+  padding: 28px 20px;
+  transition: all 0.15s;
+  -webkit-transition: all 0.15s;
+  -moz-transition: all 0.15s;
+  -o-transition: all 0.15s;
+  -ms-transition: all 0.15s;
+}
+
+.navbar li > a {
+  text-transform: uppercase;
+}
+
+.navbar .navbar-text {
+  margin-top: 0;
+  margin-bottom: 0;
+}
+.navbar li:hover > a {
+  color: #eeeeee;
+  background-color: #6db33f;
+}
+
+.navbar-toggle {
+  border-width: 0;
+
+  .icon-bar + .icon-bar {
+    margin-top: 3px;
+  }
+  .icon-bar {
+    width: 19px;
+    height: 3px;
+  }
+
+}
--- a/src/main/less/petclinic.less
+++ b/src/main/less/petclinic.less
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@icon-font-path:    "../../webjars/bootstrap/fonts/";
+
+@spring-green:      #6db33f;
+@spring-dark-green: #5fa134;
+@spring-brown:      #34302D;
+@spring-grey:       #838789;
+@spring-light-grey: #f1f1f1;
+
+@body-bg:                           @spring-light-grey;
+@text-color:                        @spring-brown;
+@link-color:                        @spring-dark-green;
+@link-hover-color:                  @spring-dark-green;
+
+@navbar-default-link-color:         @spring-light-grey;
+@navbar-default-link-active-color:  @spring-light-grey;
+@navbar-default-link-hover-color:   @spring-light-grey;
+@navbar-default-link-hover-bg:      @spring-green;
+@navbar-default-toggle-icon-bar-bg: @spring-light-grey;
+@navbar-default-toggle-hover-bg:    transparent;
+@navbar-default-link-active-bg:     @spring-green;
+
+@border-radius-base:             0;
+@border-radius-large:            0;
+@border-radius-small:            0;
+
+@btn-default-color:              @spring-light-grey;
+@btn-default-bg:                 @spring-brown;
+@btn-default-border:             @spring-green;
+
+@nav-tabs-active-link-hover-color:        @spring-light-grey;
+@nav-tabs-active-link-hover-bg:           @spring-brown;
+@nav-tabs-active-link-hover-border-color: @spring-brown;
+@nav-tabs-border-color:                   @spring-brown;
+
+@pagination-active-bg:                    @spring-brown;
+@pagination-active-border:                @spring-green;
+@table-border-color:                      @spring-brown;
+
+.table > thead > tr > th {
+  background-color: lighten(@spring-brown, 3%);
+  color: @spring-light-grey;
+}
+
+.table-filter {
+  background-color: @spring-brown;
+  padding: 9px 12px;
+}
+
+.nav > li > a {
+  color: @spring-grey;
+}
+
+.btn-default {
+  border-width: 2px;
+  transition: border 0.15s;
+  -webkit-transition: border 0.15s;
+  -moz-transition: border 0.15s;
+  -o-transition: border 0.15s;
+  -ms-transition: border 0.15s;
+
+  &:hover,
+  &:focus,
+  &:active,
+  &.active,
+  .open .dropdown-toggle& {
+    background-color: @spring-brown;
+    border-color: @spring-brown;
+  }
+}
+
+
+.container .text-muted {
+  margin: 20px 0;
+}
+
+code {
+  font-size: 80%;
+}
+
+.xd-container {
+  margin-top: 40px;
+  margin-bottom: 100px;
+  padding-left: 5px;
+  padding-right: 5px;
+}
+
+h1 {
+  margin-bottom: 15px
+}
+
+.index-page--subtitle {
+  font-size: 16px;
+  line-height: 24px;
+  margin: 0 0 30px;
+}
+
+.form-horizontal button.btn-inverse {
+  margin-left: 32px;
+}
+
+#job-params-modal .modal-dialog {
+  width: 90%;
+  margin-left:auto;
+  margin-right:auto;
+}
+
+[ng-cloak].splash {
+  display: block !important;
+}
+[ng-cloak] {
+  display: none;
+}
+
+.splash {
+  background: @spring-green;
+  color: @spring-brown;
+  display: none;
+}
+
+.error-page {
+  margin-top: 100px;
+  text-align: center;
+}
+
+.error-page .error-title {
+  font-size: 24px;
+  line-height: 24px;
+  margin: 30px 0 0;
+}
+
+table td {
+  vertical-align: middle;
+}
+
+table td .progress {
+  margin-bottom: 0;
+}
+
+table td.action-column {
+  width: 1px;
+}
+
+.help-block {
+  color: lighten(@text-color, 50%); // lighten the text some for contrast
+}
+
+.xd-containers {
+  font-size: 15px;
+}
+
+.cluster-view > table td {
+  vertical-align: top;
+}
+
+.cluster-view .label, .cluster-view .column-block {
+  display: block;
+}
+
+.cluster-view .input-group-addon {
+  width: 0%;
+}
+
+.cluster-view {
+  margin-bottom: 0;
+}
+
+.deployment-status-deployed {
+  .label-success;
+}
+
+.deployment-status-incomplete {
+  .label-warning;
+}
+
+.deployment-status-failed {
+  .label-danger;
+}
+
+.deployment-status-deploying {
+  .label-info
+}
+.deployment-status-na {
+}
+
+.container-details-table th {
+  background-color: lighten(@spring-brown, 3%);
+  color: @spring-light-grey;
+}
+
+.status-help-content-table td {
+  color: @spring-brown;
+}
+
+.alert-success {
+  .alert-variant(fade(@alert-success-bg, 70%); @alert-success-border; @alert-success-text);
+}
+.alert-info {
+  .alert-variant(fade(@alert-info-bg, 70%); @alert-info-border; @alert-info-text);
+}
+.alert-warning {
+  .alert-variant(fade(@alert-warning-bg, 70%); @alert-warning-border; @alert-warning-text);
+}
+.alert-danger {
+  .alert-variant(fade(@alert-danger-bg, 70%); @alert-danger-border; @alert-danger-text);
+}
+
+.myspinner {
+  animation-name: spinner;
+  animation-duration: 2s;
+  animation-iteration-count: infinite;
+  animation-timing-function: linear;
+
+  -webkit-transform-origin: 49% 50%;
+  -webkit-animation-name: spinner;
+  -webkit-animation-duration: 2s;
+  -webkit-animation-iteration-count: infinite;
+  -webkit-animation-timing-function: linear;
+}
+
+hr {
+  border-top: 1px dotted @spring-brown;
+}
+
+@import "typography.less";
+@import "header.less";
+@import "responsive.less";
--- a/src/main/less/responsive.less
+++ b/src/main/less/responsive.less
+@media (max-width: 768px) {
+  .navbar-toggle {
+    position:absolute;
+    z-index: 9999;
+    left:0px;
+  top:0px;
+  }
+
+  .navbar a.navbar-brand {
+    display: block;
+    margin: 0 auto 0 auto;
+    width: 148px;
+    height: 50px;
+    float: none;
+    background: url("../images/spring-logo-dataflow-mobile.png") 0 center no-repeat;
+  }
+
+  .homepage-billboard .homepage-subtitle {
+    font-size: 21px;
+    line-height: 21px;
+  }
+
+  .navbar a.navbar-brand span {
+    display: none;
+  }
+
+  .navbar {
+    border-top-width: 0;
+  }
+
+  .xd-container {
+    margin-top: 20px;
+    margin-bottom: 30px;
+  }
+
+  .index-page--subtitle {
+    margin-top: 10px;
+    margin-bottom: 30px;
+  }
+
+}
--- a/src/main/less/typography.less
+++ b/src/main/less/typography.less
+@font-face {
+  font-family: 'varela_roundregular';
+
+  src: url('../fonts/varela_round-webfont.eot');
+  src: url('../fonts/varela_round-webfont.eot?#iefix') format('embedded-opentype'),
+       url('../fonts/varela_round-webfont.woff') format('woff'),
+       url('../fonts/varela_round-webfont.ttf') format('truetype'),
+       url('../fonts/varela_round-webfont.svg#varela_roundregular') format('svg');
+  font-weight: normal;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: 'montserratregular';
+  src: url('../fonts/montserrat-webfont.eot');
+  src: url('../fonts/montserrat-webfont.eot?#iefix') format('embedded-opentype'),
+       url('../fonts/montserrat-webfont.woff') format('woff'),
+       url('../fonts/montserrat-webfont.ttf') format('truetype'),
+       url('../fonts/montserrat-webfont.svg#montserratregular') format('svg');
+  font-weight: normal;
+  font-style: normal;
+}
+
+body, h1, h2, h3, p, input {
+  margin: 0;
+  font-weight: 400;
+  font-family: "varela_roundregular", sans-serif;
+  color: #34302d;
+}
+
+h1 {
+  font-size: 24px;
+  line-height: 30px;
+  font-family: "montserratregular", sans-serif;
+}
+
+h2 {
+  font-size: 18px;
+  font-weight: 700;
+  line-height: 24px;
+  margin-bottom: 10px;
+  font-family: "montserratregular", sans-serif;
+}
+
+h3 {
+  font-size: 16px;
+  line-height: 24px;
+  margin-bottom: 10px;
+  font-weight: 700;
+}
+
+p {
+  //font-size: 15px;
+  //line-height: 24px;
+}
+
+strong {
+  font-weight: 700;
+  font-family: "montserratregular", sans-serif;
+}
--- a/src/main/resources/application-mysql.properties
+++ b/src/main/resources/application-mysql.properties
+# database init, supports mysql too
+database=mysql
+spring.datasource.url=jdbc:mysql://localhost/petclinic
+spring.datasource.username=root
+spring.datasource.password=petclinic
+# Uncomment this the first time the app runs
+# spring.datasource.initialization-mode=always
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
--- a/src/main/resources/banner.txt
+++ b/src/main/resources/banner.txt
--- a/src/main/resources/cache/ehcache.xml
+++ b/src/main/resources/cache/ehcache.xml
--- a/src/main/resources/cache/ehcache.xsd
+++ b/src/main/resources/cache/ehcache.xsd
--- a/src/main/resources/dandelion/datatables/datatables.properties
+++ b/src/main/resources/dandelion/datatables/datatables.properties
-# ==================================
-# Dandelion-Datatables configuration
-# ==================================
-
-# Disable the asset management of Dandelion-Core for all non-DataTable-related assets
-main.standalone=true
\ No newline at end of file
--- a/src/main/resources/db/hsqldb/populateDB.sql
+++ b/src/main/resources/db/hsqldb/populateDB.sql
--- a/src/main/resources/db/hsqldb/initDB.sql
+++ b/src/main/resources/db/hsqldb/initDB.sql
--- a/src/main/resources/db/mysql/populateDB.sql
+++ b/src/main/resources/db/mysql/populateDB.sql
--- a/src/main/resources/db/mysql/petclinic_db_setup_mysql.txt
+++ b/src/main/resources/db/mysql/petclinic_db_setup_mysql.txt
--- a/src/main/resources/db/mysql/initDB.sql
+++ b/src/main/resources/db/mysql/initDB.sql
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
No results found