diff --git a/.gitignore b/.gitignore index 42c9d5f..e21dba8 100644 --- a/.gitignore +++ b/.gitignore @@ -249,6 +249,8 @@ out/ **/src/main/resources/application-rds-local.yml **/src/main/resources/application-rds-prod.yml # End of https://www.toptal.com/developers/gitignore/api/macos,intellij,java,intellij+all +**/src/main/resources/application-redis-local.yml +**/src/main/resources/application-redis-prod.yml # 깃허브 서브모듈 관련 폴더 ignore backend-submodule/ \ No newline at end of file diff --git a/backend-submodule b/backend-submodule index fe17b96..b584dfb 160000 --- a/backend-submodule +++ b/backend-submodule @@ -1 +1 @@ -Subproject commit fe17b966c72644dda756362a840613a9fa43b83c +Subproject commit b584dfb1cba11bbabd54c3278d689958263b4a0c diff --git a/build.gradle b/build.gradle index 6056fdd..36bcc61 100644 --- a/build.gradle +++ b/build.gradle @@ -64,7 +64,13 @@ configure(subprojects.findAll { it.name != 'common' && it.name != 'execute' }) { task copyPrivate(type: Copy) { copy { from './backend-submodule' - include "*.yml" + include "application-rds-prod.yml" into 'domain/domain-rds/src/main/resources' } + + copy { + from './backend-submodule' + include "application-redis-prod.yml" + into 'infra/infra-redis/src/main/resources' + } } \ No newline at end of file diff --git a/infra/infra-redis/.gitattributes b/infra/infra-redis/.gitattributes new file mode 100644 index 0000000..8af972c --- /dev/null +++ b/infra/infra-redis/.gitattributes @@ -0,0 +1,3 @@ +/gradlew text eol=lf +*.bat text eol=crlf +*.jar binary diff --git a/infra/infra-redis/.gitignore b/infra/infra-redis/.gitignore new file mode 100644 index 0000000..c2065bc --- /dev/null +++ b/infra/infra-redis/.gitignore @@ -0,0 +1,37 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/infra/infra-redis/build.gradle b/infra/infra-redis/build.gradle new file mode 100644 index 0000000..30e7cbd --- /dev/null +++ b/infra/infra-redis/build.gradle @@ -0,0 +1,8 @@ +bootJar { enabled = false } +jar { enabled = true } + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-data-redis' +} + +tasks.register("prepareKotlinBuildScriptModel"){} \ No newline at end of file diff --git a/infra/infra-redis/gradle/wrapper/gradle-wrapper.jar b/infra/infra-redis/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..a4b76b9 Binary files /dev/null and b/infra/infra-redis/gradle/wrapper/gradle-wrapper.jar differ diff --git a/infra/infra-redis/gradle/wrapper/gradle-wrapper.properties b/infra/infra-redis/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..e2847c8 --- /dev/null +++ b/infra/infra-redis/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/infra/infra-redis/gradlew b/infra/infra-redis/gradlew new file mode 100755 index 0000000..f5feea6 --- /dev/null +++ b/infra/infra-redis/gradlew @@ -0,0 +1,252 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original 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 +# +# 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. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/infra/infra-redis/gradlew.bat b/infra/infra-redis/gradlew.bat new file mode 100644 index 0000000..9d21a21 --- /dev/null +++ b/infra/infra-redis/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/infra/infra-redis/settings.gradle b/infra/infra-redis/settings.gradle new file mode 100644 index 0000000..fc27b30 --- /dev/null +++ b/infra/infra-redis/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'infra-redis' diff --git a/infra/infra-redis/src/main/java/com/drinkhere/infraredis/InfraRedisApplication.java b/infra/infra-redis/src/main/java/com/drinkhere/infraredis/InfraRedisApplication.java new file mode 100644 index 0000000..85c95ae --- /dev/null +++ b/infra/infra-redis/src/main/java/com/drinkhere/infraredis/InfraRedisApplication.java @@ -0,0 +1,15 @@ +package com.drinkhere.infraredis; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.ComponentScan; + +@SpringBootApplication +@ComponentScan(basePackages = "com.drinkhere") +public class InfraRedisApplication { + + public static void main(String[] args) { + SpringApplication.run(InfraRedisApplication.class, args); + } + +} diff --git a/infra/infra-redis/src/main/java/com/drinkhere/infraredis/config/RedisConfig.java b/infra/infra-redis/src/main/java/com/drinkhere/infraredis/config/RedisConfig.java new file mode 100644 index 0000000..573fecf --- /dev/null +++ b/infra/infra-redis/src/main/java/com/drinkhere/infraredis/config/RedisConfig.java @@ -0,0 +1,71 @@ +package com.drinkhere.infraredis.config; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.cache.CacheManager; +import org.springframework.cache.annotation.EnableCaching; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.cache.RedisCacheConfiguration; +import org.springframework.data.redis.cache.RedisCacheManager; +import org.springframework.data.redis.connection.RedisConnectionFactory; +import org.springframework.data.redis.connection.RedisStandaloneConfiguration; +import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.listener.RedisMessageListenerContainer; +import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer; +import org.springframework.data.redis.serializer.RedisSerializationContext; +import org.springframework.data.redis.serializer.StringRedisSerializer; + + +@Configuration +@EnableCaching +public class RedisConfig { + + @Value("${spring.data.redis.host}") + private String host; + + @Value("${spring.data.redis.port}") + private int port; + + @Bean + public RedisConnectionFactory redisConnectionFactory() { + RedisStandaloneConfiguration configuration = new RedisStandaloneConfiguration(); + configuration.setHostName(host); + configuration.setPort(port); + return new LettuceConnectionFactory(configuration); + } + + @Bean + public CacheManager redisCacheManager( + RedisConnectionFactory redisConnectionFactory) { + RedisCacheConfiguration configuration = RedisCacheConfiguration + .defaultCacheConfig() + .serializeKeysWith(RedisSerializationContext.SerializationPair + .fromSerializer(new StringRedisSerializer())) + .serializeValuesWith(RedisSerializationContext.SerializationPair + .fromSerializer(new GenericJackson2JsonRedisSerializer())); + + return RedisCacheManager.RedisCacheManagerBuilder + .fromConnectionFactory(redisConnectionFactory) + .cacheDefaults(configuration) + .build(); + } + + @Bean + public RedisMessageListenerContainer redisMessageListenerContainer( + RedisConnectionFactory redisConnectionFactory) { + RedisMessageListenerContainer container = new RedisMessageListenerContainer(); + container.setConnectionFactory(redisConnectionFactory); + return container; + } + + @Bean + public RedisTemplate redisTemplate( + RedisConnectionFactory redisConnectionFactory) { + RedisTemplate redisTemplate = new RedisTemplate<>(); + redisTemplate.setConnectionFactory(redisConnectionFactory); + redisTemplate.setKeySerializer(new StringRedisSerializer()); + redisTemplate.setValueSerializer(new GenericJackson2JsonRedisSerializer()); + return redisTemplate; + } +} \ No newline at end of file diff --git a/infra/infra-redis/src/main/java/com/drinkhere/infraredis/util/RedisUtil.java b/infra/infra-redis/src/main/java/com/drinkhere/infraredis/util/RedisUtil.java new file mode 100644 index 0000000..bd66e0d --- /dev/null +++ b/infra/infra-redis/src/main/java/com/drinkhere/infraredis/util/RedisUtil.java @@ -0,0 +1,72 @@ +package com.drinkhere.infraredis.util; + +import lombok.RequiredArgsConstructor; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.stereotype.Component; + +import java.util.concurrent.TimeUnit; + +@Component +@RequiredArgsConstructor +public class RedisUtil { + // RedisTemplate은 Redis와 상호작용하는 다양한 작업을 제공하는 클래스 + // 키는 String으로, 값은 Object 타입으로 저장될 수 있는 키-값 저장소로서 Redis와 작업 + private final RedisTemplate redisTemplate; + + /** + * 지정된 만료 시간과 함께 값을 Redis에 저장하는 메서드. + * 'key'에 해당하는 값 'val'을 지정된 시간 'time' 동안 Redis에 저장. + * 시간 단위는 'timeUnit'으로 설정. + * @param key Redis에 저장할 키. + * @param val Redis에 저장할 값. + * @param time 해당 값이 Redis에 유지될 시간. + * @param timeUnit 시간의 단위 (초, 분 등). + */ + public void saveAsValue(String key, Object val, Long time, TimeUnit timeUnit) { + redisTemplate.opsForValue().set(key, val, time, timeUnit); + } + + /** + * 만료 시간 없이 값을 Redis에 영구적으로 저장하는 메서드. + * @param key Redis에 저장할 키. + * @param val Redis에 저장할 값. + */ + public void saveAsPermanentValue(String key, Object val) { + redisTemplate.opsForValue().set(key, val); + } + + /** + * Redis에 해당 키가 존재하는지 확인하는 메서드. + * + * @param key Redis에서 존재 여부를 확인할 키. + * @return 키가 존재하면 true, 없으면 false를 반환. + */ + public boolean hasKey(String key) { + return Boolean.TRUE.equals(redisTemplate.hasKey(key)); + } + + + /** + * Redis에서 값을 조회하는 메서드. + * + * @param key 조회할 값과 연결된 키. + * @return 주어진 키에 연결된 값, 또는 키가 존재하지 않을 경우 null. + */ + public Object get(String key) { + return redisTemplate.opsForValue().get(key); + } + public Object getValue(String key) { + return get(key); + } + + + /** + * Redis에서 해당 키를 삭제하는 메서드. + * + * @param key 삭제할 키. + * @return 키가 성공적으로 삭제되면 true, 그렇지 않으면 false. + */ + public boolean delete(String key) { + return Boolean.TRUE.equals(redisTemplate.delete(key)); + } +} \ No newline at end of file diff --git a/infra/infra-redis/src/test/java/com/drinkhere/infraredis/InfraRedisApplicationTests.java b/infra/infra-redis/src/test/java/com/drinkhere/infraredis/InfraRedisApplicationTests.java new file mode 100644 index 0000000..858e04f --- /dev/null +++ b/infra/infra-redis/src/test/java/com/drinkhere/infraredis/InfraRedisApplicationTests.java @@ -0,0 +1,13 @@ +package com.drinkhere.infraredis; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class InfraRedisApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/settings.gradle b/settings.gradle index 988cbdd..5ab3740 100644 --- a/settings.gradle +++ b/settings.gradle @@ -6,8 +6,11 @@ include 'common' // Domain 모듈 include 'domain:domain-rds' +// Infra 모듈 +include 'infra:infra-redis' + // API 모듈 include 'api:api-health-check' // 실행 모듈 -include 'execute' \ No newline at end of file +include 'execute'