diff --git a/Jenkinsfile b/Jenkinsfile index 0fab237..edecc30 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,7 @@ -def SERVICE_GROUP = "sample" +def SERVICE_GROUP = "demo" def SERVICE_NAME = "spring" def IMAGE_NAME = "${SERVICE_GROUP}-${SERVICE_NAME}" -def REPOSITORY_URL = "https://github.com/timurgaleev/sample-spring" +def REPOSITORY_URL = "https://github.com/timurgaleev/demo-spring" def REPOSITORY_SECRET = "" def SLACK_TOKEN_DEV = "" def SLACK_TOKEN_DQA = "" @@ -104,7 +104,7 @@ podTemplate(label: label, containers: [ container("builder") { try { // deploy(cluster, namespace, sub_domain, profile, values_path) - builder.deploy("local", "${SERVICE_GROUP}", "${IMAGE_NAME}-sample", "dev") + builder.deploy("local", "${SERVICE_GROUP}", "${IMAGE_NAME}-demo", "dev") // builder.success(SLACK_TOKEN_DEV, "Deploy LOCAL") } catch (e) { // builder.failure(SLACK_TOKEN_DEV, "Deploy LOCAL") diff --git a/README.md b/README.md index e617634..2d293be 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ -# sample-spring +# demo-spring -[![GitHub release](https://img.shields.io/github/release/timurgaleev/sample-spring.svg)](https://github.com/timurgaleev/sample-spring/releases) +[![GitHub release](https://img.shields.io/github/release/timurgaleev/demo-spring.svg)](https://github.com/timurgaleev/demo-spring/releases) -[![DockerHub Badge](http://dockeri.co/image/timurgaleev/sample-spring)](https://hub.docker.com/r/timurgaleev/sample-spring) +[![DockerHub Badge](http://dockeri.co/image/timurgaleev/demo-spring)](https://hub.docker.com/r/timurgaleev/demo-spring) ## Docker ```bash -docker pull timurgaleev/sample-spring +docker pull timurgaleev/demo-spring ``` diff --git a/charts/sample-spring/Chart.yaml b/charts/sample-spring/Chart.yaml index d740097..6dff268 100644 --- a/charts/sample-spring/Chart.yaml +++ b/charts/sample-spring/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -name: sample-spring +name: demo-spring description: A Helm chart for Kubernetes icon: https://avatars0.githubusercontent.com/u/39108256 appVersion: v0.1.0 diff --git a/charts/sample-spring/templates/NOTES.txt b/charts/sample-spring/templates/NOTES.txt index 33736e0..1284f06 100644 --- a/charts/sample-spring/templates/NOTES.txt +++ b/charts/sample-spring/templates/NOTES.txt @@ -6,16 +6,16 @@ {{- end }} {{- end }} {{- else if contains "NodePort" .Values.service.type }} - export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "sample.fullname" . }}) + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "demo.fullname" . }}) export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") echo http://$NODE_IP:$NODE_PORT {{- else if contains "LoadBalancer" .Values.service.type }} NOTE: It may take a few minutes for the LoadBalancer IP to be available. - You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "sample.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "sample.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") + You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "demo.fullname" . }}' + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "demo.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") echo http://$SERVICE_IP:{{ .Values.service.port }} {{- else if contains "ClusterIP" .Values.service.type }} - export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "sample.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") + export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "demo.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") echo "Visit http://127.0.0.1:8080 to use your application" kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:80 {{- end }} diff --git a/charts/sample-spring/templates/_helpers.tpl b/charts/sample-spring/templates/_helpers.tpl index a4c53c9..e0b4eed 100644 --- a/charts/sample-spring/templates/_helpers.tpl +++ b/charts/sample-spring/templates/_helpers.tpl @@ -2,7 +2,7 @@ {{/* Expand the name of the chart. */}} -{{- define "sample.name" -}} +{{- define "demo.name" -}} {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} {{- end }} @@ -11,7 +11,7 @@ Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). If release name contains chart name it will be used as a full name. */}} -{{- define "sample.fullname" -}} +{{- define "demo.fullname" -}} {{- if .Values.fullnameOverride }} {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} {{- else }} @@ -27,16 +27,16 @@ If release name contains chart name it will be used as a full name. {{/* Create chart name and version as used by the chart label. */}} -{{- define "sample.chart" -}} +{{- define "demo.chart" -}} {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} {{- end }} {{/* Common labels */}} -{{- define "sample.labels" -}} -helm.sh/chart: {{ include "sample.chart" . }} -{{ include "sample.selectorLabels" . }} +{{- define "demo.labels" -}} +helm.sh/chart: {{ include "demo.chart" . }} +{{ include "demo.selectorLabels" . }} {{- if .Chart.AppVersion }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} {{- end }} @@ -46,17 +46,17 @@ app.kubernetes.io/managed-by: {{ .Release.Service }} {{/* Selector labels */}} -{{- define "sample.selectorLabels" -}} -app.kubernetes.io/name: {{ include "sample.name" . }} +{{- define "demo.selectorLabels" -}} +app.kubernetes.io/name: {{ include "demo.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} {{- end }} {{/* Create the name of the service account to use */}} -{{- define "sample.serviceAccountName" -}} +{{- define "demo.serviceAccountName" -}} {{- if .Values.serviceAccount.create }} -{{- default (include "sample.fullname" .) .Values.serviceAccount.name }} +{{- default (include "demo.fullname" .) .Values.serviceAccount.name }} {{- else }} {{- default "default" .Values.serviceAccount.name }} {{- end }} diff --git a/charts/sample-spring/templates/configmap.yaml b/charts/sample-spring/templates/configmap.yaml index 820dc3f..3119886 100644 --- a/charts/sample-spring/templates/configmap.yaml +++ b/charts/sample-spring/templates/configmap.yaml @@ -2,9 +2,9 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ include "sample.fullname" . }} + name: {{ include "demo.fullname" . }} labels: - {{- include "sample.labels" . | nindent 4 }} + {{- include "demo.labels" . | nindent 4 }} data: {{- with .Values.configmap.data }} {{ toYaml . | indent 2 }} diff --git a/charts/sample-spring/templates/deployment.yaml b/charts/sample-spring/templates/deployment.yaml index 1a0c3fe..24266e5 100644 --- a/charts/sample-spring/templates/deployment.yaml +++ b/charts/sample-spring/templates/deployment.yaml @@ -1,16 +1,16 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ include "sample.fullname" . }} + name: {{ include "demo.fullname" . }} labels: - {{- include "sample.labels" . | nindent 4 }} + {{- include "demo.labels" . | nindent 4 }} spec: {{- if not .Values.autoscaling.enabled }} replicas: {{ .Values.replicaCount }} {{- end }} selector: matchLabels: - {{- include "sample.selectorLabels" . | nindent 6 }} + {{- include "demo.selectorLabels" . | nindent 6 }} template: metadata: {{- with .Values.podAnnotations }} @@ -18,13 +18,13 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} labels: - {{- include "sample.selectorLabels" . | nindent 8 }} + {{- include "demo.selectorLabels" . | nindent 8 }} spec: {{- with .Values.imagePullSecrets }} imagePullSecrets: {{- toYaml . | nindent 8 }} {{- end }} - serviceAccountName: {{ include "sample.serviceAccountName" . }} + serviceAccountName: {{ include "demo.serviceAccountName" . }} securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} containers: @@ -82,11 +82,11 @@ spec: {{ end }} {{ if .Values.configmap.enabled }} - configMapRef: - name: {{ include "sample.fullname" . }} + name: {{ include "demo.fullname" . }} {{ end }} {{ if .Values.secret.enabled }} - secretRef: - name: {{ include "sample.fullname" . }} + name: {{ include "demo.fullname" . }} {{ end }} {{- with .Values.nodeSelector }} nodeSelector: diff --git a/charts/sample-spring/templates/hpa.yaml b/charts/sample-spring/templates/hpa.yaml index 443397f..66c50f9 100644 --- a/charts/sample-spring/templates/hpa.yaml +++ b/charts/sample-spring/templates/hpa.yaml @@ -2,14 +2,14 @@ apiVersion: autoscaling/v2beta1 kind: HorizontalPodAutoscaler metadata: - name: {{ include "sample.fullname" . }} + name: {{ include "demo.fullname" . }} labels: - {{- include "sample.labels" . | nindent 4 }} + {{- include "demo.labels" . | nindent 4 }} spec: scaleTargetRef: apiVersion: apps/v1 kind: Deployment - name: {{ include "sample.fullname" . }} + name: {{ include "demo.fullname" . }} minReplicas: {{ .Values.autoscaling.minReplicas }} maxReplicas: {{ .Values.autoscaling.maxReplicas }} metrics: diff --git a/charts/sample-spring/templates/ingress.yaml b/charts/sample-spring/templates/ingress.yaml index ca2f352..cb4822d 100644 --- a/charts/sample-spring/templates/ingress.yaml +++ b/charts/sample-spring/templates/ingress.yaml @@ -1,5 +1,5 @@ {{- if .Values.ingress.enabled -}} -{{- $fullName := include "sample.fullname" . -}} +{{- $fullName := include "demo.fullname" . -}} {{- $servicePort := .Values.service.port -}} {{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 @@ -10,7 +10,7 @@ kind: Ingress metadata: name: {{ $fullName }} labels: - {{- include "sample.labels" . | nindent 4 }} + {{- include "demo.labels" . | nindent 4 }} {{- with .Values.ingress.annotations }} annotations: {{- toYaml . | nindent 4 }} diff --git a/charts/sample-spring/templates/secret.yaml b/charts/sample-spring/templates/secret.yaml index 2435adf..4fcd6c6 100644 --- a/charts/sample-spring/templates/secret.yaml +++ b/charts/sample-spring/templates/secret.yaml @@ -2,9 +2,9 @@ apiVersion: v1 kind: Secret metadata: - name: {{ include "sample.fullname" . }} + name: {{ include "demo.fullname" . }} labels: - {{- include "sample.labels" . | nindent 4 }} + {{- include "demo.labels" . | nindent 4 }} type: Opaque data: {{- with .Values.secret.data }} diff --git a/charts/sample-spring/templates/service-monitor.yaml b/charts/sample-spring/templates/service-monitor.yaml index 3a88f13..41bd21c 100644 --- a/charts/sample-spring/templates/service-monitor.yaml +++ b/charts/sample-spring/templates/service-monitor.yaml @@ -1,14 +1,14 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: {{ include "sample.fullname" . }} + name: {{ include "demo.fullname" . }} labels: release: prometheus-operator - {{- include "sample.labels" . | nindent 4 }} + {{- include "demo.labels" . | nindent 4 }} spec: selector: matchLabels: - app: {{ include "sample.fullname" . }} + app: {{ include "demo.fullname" . }} endpoints: - interval: 10s port: tcp-jmx diff --git a/charts/sample-spring/templates/service.yaml b/charts/sample-spring/templates/service.yaml index 3205ed1..ba649b3 100644 --- a/charts/sample-spring/templates/service.yaml +++ b/charts/sample-spring/templates/service.yaml @@ -1,9 +1,9 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "sample.fullname" . }} + name: {{ include "demo.fullname" . }} labels: - {{- include "sample.labels" . | nindent 4 }} + {{- include "demo.labels" . | nindent 4 }} spec: type: {{ .Values.service.type }} ports: @@ -12,4 +12,4 @@ spec: protocol: TCP name: http selector: - {{- include "sample.selectorLabels" . | nindent 4 }} + {{- include "demo.selectorLabels" . | nindent 4 }} diff --git a/charts/sample-spring/templates/serviceaccount.yaml b/charts/sample-spring/templates/serviceaccount.yaml index 0845327..64e0c8c 100644 --- a/charts/sample-spring/templates/serviceaccount.yaml +++ b/charts/sample-spring/templates/serviceaccount.yaml @@ -2,9 +2,9 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: {{ include "sample.serviceAccountName" . }} + name: {{ include "demo.serviceAccountName" . }} labels: - {{- include "sample.labels" . | nindent 4 }} + {{- include "demo.labels" . | nindent 4 }} {{- with .Values.serviceAccount.annotations }} annotations: {{- toYaml . | nindent 4 }} diff --git a/charts/sample-spring/templates/tests/test-connection.yaml b/charts/sample-spring/templates/tests/test-connection.yaml index 7349f8b..0b1981a 100644 --- a/charts/sample-spring/templates/tests/test-connection.yaml +++ b/charts/sample-spring/templates/tests/test-connection.yaml @@ -1,9 +1,9 @@ apiVersion: v1 kind: Pod metadata: - name: "{{ include "sample.fullname" . }}-test-connection" + name: "{{ include "demo.fullname" . }}-test-connection" labels: - {{- include "sample.labels" . | nindent 4 }} + {{- include "demo.labels" . | nindent 4 }} annotations: "helm.sh/hook": test-success spec: @@ -11,5 +11,5 @@ spec: - name: wget image: busybox command: ['wget'] - args: ['{{ include "sample.fullname" . }}:{{ .Values.service.port }}'] + args: ['{{ include "demo.fullname" . }}:{{ .Values.service.port }}'] restartPolicy: Never diff --git a/charts/sample-spring/values.yaml b/charts/sample-spring/values.yaml index 7d7b73a..4d2f184 100644 --- a/charts/sample-spring/values.yaml +++ b/charts/sample-spring/values.yaml @@ -1,9 +1,9 @@ -# Default values for sample. +# Default values for demo. # This is a YAML-formatted file. # Declare variables to be passed into your templates. -nameOverride: "sample-spring" -fullnameOverride: "sample-spring" +nameOverride: "demo-spring" +fullnameOverride: "demo-spring" namespace: "" @@ -54,13 +54,13 @@ ingress: subdomain: "" basedomain: "" hosts: [] - # - host: sample-spring.localhost + # - host: demo-spring.localhost # paths: # - / tls: [] - # - secretName: sample-spring-tls + # - secretName: demo-spring-tls # hosts: - # - sample-spring.localhost + # - demo-spring.localhost livenessProbe: httpGet: diff --git a/docker-compose.yaml b/docker-compose.yaml new file mode 100644 index 0000000..8c8b4e0 --- /dev/null +++ b/docker-compose.yaml @@ -0,0 +1,44 @@ +version: '3.3' +services: + postgres: + image: postgres:11.5 + container_name: postgres + environment: + - POSTGRES_PASSWORD=postgres + - POSTGRES_USER=postgres + - POSTGRES_DB=postgres + ports: + - "5432:5432" + volumes: + - ./target/postgres/data:/var/lib/postgresql/data + + pgadmin: + image: dpage/pgadmin4 + container_name: pg_admin + environment: + - PGADMIN_DEFAULT_EMAIL=timur_galeev@outlook.com + - PGADMIN_DEFAULT_PASSWORD=postgres + ports: + - "5555:80" + volumes: + - ./target/pgadmin/data:/var/lib/pgadmin + links: + - postgres + + demo-spring: + container_name: demo-spring + depends_on: + - postgres + build: + context: . + links: + - postgres + ports: + - 8080:8080 + restart: always + environment: + - DATABASE_ADDRESS=postgres + - DATABASE_PORT=5432 + - DATABASE_NAME=postgres + - DATABASE_USERNAME=postgres + - DATABASE_PASSWORD=postgres \ No newline at end of file diff --git a/pom.xml b/pom.xml index c22dbc0..5cc2207 100644 --- a/pom.xml +++ b/pom.xml @@ -4,11 +4,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.example - sample-spring - 1.0-SNAPSHOT + com.timzu + demo-spring + ${current.version} jar + + 1.8 + + 1.2.1 + + org.springframework.boot spring-boot-starter-parent @@ -17,37 +23,54 @@ + org.springframework.boot spring-boot-starter-web + + org.springframework.boot spring-boot-starter-mustache + org.springframework.boot spring-boot-devtools true + org.springframework.boot spring-boot-starter-data-jpa + + + org.apache.tomcat + tomcat-jdbc + + + + + org.postgresql + postgresql + runtime + + + + + org.springframework.boot spring-boot-starter-test test - - 1.8 - - @@ -57,4 +80,5 @@ + \ No newline at end of file diff --git a/src/main/java/com/example/tgaleev/Application.java b/src/main/java/com/timzu/spring/Application.java similarity index 87% rename from src/main/java/com/example/tgaleev/Application.java rename to src/main/java/com/timzu/spring/Application.java index b8c1ca7..bc54606 100644 --- a/src/main/java/com/example/tgaleev/Application.java +++ b/src/main/java/com/timzu/spring/Application.java @@ -1,4 +1,4 @@ -package com.example.tgaleev; +package com.timzu.simple; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/src/main/java/com/example/tgaleev/GreetingController.java b/src/main/java/com/timzu/spring/controller/GreetingController.java similarity index 85% rename from src/main/java/com/example/tgaleev/GreetingController.java rename to src/main/java/com/timzu/spring/controller/GreetingController.java index 688315e..1640718 100644 --- a/src/main/java/com/example/tgaleev/GreetingController.java +++ b/src/main/java/com/timzu/spring/controller/GreetingController.java @@ -1,7 +1,7 @@ -package com.example.tgaleev; +package com.timzu.simple; -import com.example.tgaleev.domain.Message; -import com.example.tgaleev.repos.MessageRepo; +import com.timzu.simple.domain.Message; +import com.timzu.simple.repos.MessageRepo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/com/example/tgaleev/domain/Message.java b/src/main/java/com/timzu/spring/domain/Message.java similarity index 89% rename from src/main/java/com/example/tgaleev/domain/Message.java rename to src/main/java/com/timzu/spring/domain/Message.java index 041ba1c..7b2b72e 100644 --- a/src/main/java/com/example/tgaleev/domain/Message.java +++ b/src/main/java/com/timzu/spring/domain/Message.java @@ -1,4 +1,4 @@ -package com.example.tgaleev.domain; +package com.timzu.simple.domain; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; diff --git a/src/main/java/com/example/tgaleev/repos/MessageRepo.java b/src/main/java/com/timzu/spring/repos/MessageRepo.java similarity index 60% rename from src/main/java/com/example/tgaleev/repos/MessageRepo.java rename to src/main/java/com/timzu/spring/repos/MessageRepo.java index c5d1397..6c778df 100644 --- a/src/main/java/com/example/tgaleev/repos/MessageRepo.java +++ b/src/main/java/com/timzu/spring/repos/MessageRepo.java @@ -1,6 +1,6 @@ -package com.example.tgaleev.repos; +package com.timzu.simple.repos; -import com.example.tgaleev.domain.Message; +import com.timzu.simple.domain.Message; import org.springframework.data.repository.CrudRepository; public interface MessageRepo extends CrudRepository { diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties deleted file mode 100644 index d2980f9..0000000 --- a/src/main/resources/application.properties +++ /dev/null @@ -1,5 +0,0 @@ -spring.jpa.hibernate.ddl-auto=create -spring.datasource.url=jdbc:mysql://mysql:3306/provectus?useSSL=false -spring.datasource.username=root -spring.datasource.password=143625 -spring.datasource.driver-class-name=com.mysql.jdbc.Driver diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml new file mode 100644 index 0000000..a049e0b --- /dev/null +++ b/src/main/resources/application.yml @@ -0,0 +1,57 @@ +server: + port: 8080 + +spring: + application: + name: demo-spring + profiles: + active: ${PROFILE:default} + mvc: + static-path-pattern: /static/** + jpa: + hibernate: + ddl-auto: create + # dialect: org.hibernate.dialect.MySQLDialect + dialect: org.hibernate.dialect.PostgreSQLDialect + datasource: + url: jdbc:postgresql://${DATABASE_ADDRESS:localhost}:${DATABASE_PORT:5432}/${DATABASE_NAME:postgres} + username: ${DATABASE_USERNAME:postgres} + password: ${DATABASE_PASSWORD:postgres} + driver-class-name: org.postgresql.Driver + hikari: + connection-timeout: 30000 + idle-timeout: 600000 + max-lifetime: 1800000 + maximum-pool-size: 10 + +message: ${MESSAGE:Refreshed} + +version: ${VERSION:v0.0.0} + +--- +spring: + profiles: default + jpa: + show-sql: true + +message: ":tada: Local Server UP" + +--- +spring: + profiles: dev + jpa: + show-sql: true + +message: ":tada: Development Server UP" + +--- +spring: + profiles: stage + +message: ":tada: Staging Server UP" + +--- +spring: + profiles: prod + +message: ":tada: Production Server UP" \ No newline at end of file diff --git a/src/main/resources/templates/main.mustache b/src/main/resources/templates/main.mustache index 3668999..f04fc80 100644 --- a/src/main/resources/templates/main.mustache +++ b/src/main/resources/templates/main.mustache @@ -1,6 +1,6 @@ - + - Super difficult test + Simple spring
What's your name?
@@ -22,4 +22,4 @@ {{/messages}} - \ No newline at end of file + \ No newline at end of file diff --git a/src/test/java/com/example/aksisapp/firsttest.java b/src/test/java/com/timzu/spring/firsttest.java similarity index 90% rename from src/test/java/com/example/aksisapp/firsttest.java rename to src/test/java/com/timzu/spring/firsttest.java index 55183fe..d4f130c 100644 --- a/src/test/java/com/example/aksisapp/firsttest.java +++ b/src/test/java/com/timzu/spring/firsttest.java @@ -1,4 +1,4 @@ -package com.example.tgaleev; +package com.timzu.simple; import org.junit.Test; import org.junit.runner.RunWith;