diff --git a/spring-cli/README .md b/spring-cli/README .md deleted file mode 100644 index c9e32c63..00000000 --- a/spring-cli/README .md +++ /dev/null @@ -1,56 +0,0 @@ -# Spring CLI integration - -Spring CLI integration with a project catalog to help you create Spring Boot projects using Oracle and [Oracle Backend for Microservices and AI](https://bit.ly/OracleAI-microservices). - -## Install Spring CLI - -The goal of the Spring CLI is to increase your productivity when you create new projects and when you add functionality to existing projects. [Spring CLI documentation](https://docs.spring.io/spring-cli/reference/index.html) describes how to install the CLI on various platforms. - -## Add to Spring CLI - -Execute the following command to add the `project-catalog` for [Oracle Backend for Microservices and AI](https://bit.ly/OracleAI-microservices). - -```shell -spring project-catalog add --name obaas --url https://github.com/oracle/spring-cloud-oracle/tree/main/spring-cli/catalog -``` - -The Spring CLI is now aware of the [Oracle Backend for Microservices and AI](https://bit.ly/OracleAI-microservices) integration. - -## Create project - -To create a new project use the following command (there are more options available): - -```shell -spring boot new --from obaas --name myproject -``` - -## Run the Spring CLI application locally - -To run the application locally you need access to an Oracle Database (remotely or locally). Create a shell script with the following content called `run-app.sh` and set the values for the variables to reflect your environment. - -```shell -#!/bin/bash -export spring_datasource_url= -export liquibase_datasource_username= -export liquibase_datasource_password= -export spring_datasource_username= -export spring_datasource_password= -export otel_exporter_otlp_endpoint=http://localhost:8080 # Dummy URL -./mvnw spring-boot:run -Dspring-boot.run.profiles=local -``` - -The Spring profile `local` turns off Eureka discovery and OTLP tracing. - -Execute the shell script running the following command: - -```shell -source run-app.sh -``` - -You can see a few `WARNINGS` with this message which can be ignored: - -```log -WARNING: - -Liquibase detected the following invalid LIQUIBASE_* environment variables: -``` diff --git a/spring-cli/catalog/project-catalog.yml b/spring-cli/catalog/project-catalog.yml deleted file mode 100644 index f4823be3..00000000 --- a/spring-cli/catalog/project-catalog.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -project-repositories: -- name: "obaas" - description: "RESTful Greeting service for Oracle Backend Microservices and AI" - url: "https://github.com/oracle/spring-cloud-oci/tree/main/spring-cli/projects/obaas" - tags: - - "obaas" - - "java-21" - - "rest" - - "web" - - "boot-3.4.x" diff --git a/spring-cli/projects/obaas/.gitignore b/spring-cli/projects/obaas/.gitignore deleted file mode 100644 index 549e00a2..00000000 --- a/spring-cli/projects/obaas/.gitignore +++ /dev/null @@ -1,33 +0,0 @@ -HELP.md -target/ -!.mvn/wrapper/maven-wrapper.jar -!**/src/main/**/target/ -!**/src/test/**/target/ - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ -build/ -!**/src/main/**/build/ -!**/src/test/**/build/ - -### VS Code ### -.vscode/ diff --git a/spring-cli/projects/obaas/LICENSE b/spring-cli/projects/obaas/LICENSE deleted file mode 100644 index 261eeb9e..00000000 --- a/spring-cli/projects/obaas/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - 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 - - 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. diff --git a/spring-cli/projects/obaas/README.adoc b/spring-cli/projects/obaas/README.adoc deleted file mode 100644 index d3bb5137..00000000 --- a/spring-cli/projects/obaas/README.adoc +++ /dev/null @@ -1,55 +0,0 @@ -== Basic Spring Web Application for Oracle Backend for Spring Boot and Microservices - -This project contains a web service that can be deployed on link:https://bit.ly/OracleAI-microservices[Oracle Backend for Microservices and AI] and includes configuration for the well-known endpoints provided by the platform. The web service will accept HTTP GET requests at `http://localhost:8080/greeting`. - -It will respond with a JSON representation of a greeting, as the following listing shows: - -==== -[source,json] ----- -{"id":1,"content":"Hello, World!"} ----- -==== - -You can customize the greeting with an optional `name` parameter in the query string, as the following listing shows: - -==== -[source,text] ----- -http://localhost:8080/greeting?name=User ----- -==== - -The `name` parameter value overrides the default value of `World` and is reflected in the response, as the following listing shows: - -==== -[source,json] ----- -{"id":1,"content":"Hello, User!"} ----- -==== - -=== Building and running locally - -[source,bash] ----- -./mvnw spring-boot:run -Dspring-boot.run.profiles=local ----- - -Then access the endpoint - -[source,bash] ----- -curl http://localhost:8080/greeting?name=User ----- - -== About the sample code - -The link:./pom.xml[Maven POM file] contains dependencies for commonly used features. You should review the POM file and remove any dependencies that you do not need. -Note that there may be dependency configuration in the link:./src/main/resources/application.yaml[Spring application configuration file] as well, which you should remove if you remove the matching dependency. - -The link:./src/main/resources/application.yaml[Spring application configuration file] contains comments that explain what the various configuration included is for. You can use this as an example starting point and modify it to suit your needs. - -There are example link:./src/main/resources/db/changelog[Liquibase] configuration files provided. If you want to use Liquibase, you will need to modify these to meet your needs. Note that the use of Liquibase is optional. If you do not wish to use Liquibase you can safely remove the `src/main/resources/db` directory, the Liquibase dependency in the POM, the Liquibase build plugin in the POM, and the Liquibase configuration in the Spring application configuration file. - -This example uses Oracle Universal Connection Pool (UCP) and also includes the dependencies for Oracle Wallet authentication and mTLS. These are optional. If you prefer to use HikariCP, you can remove the dependencies from the POM and the `oracleucp` section in the datasource configuration in the Spring application configuration file. diff --git a/spring-cli/projects/obaas/mvnw b/spring-cli/projects/obaas/mvnw deleted file mode 100755 index eb65ff25..00000000 --- a/spring-cli/projects/obaas/mvnw +++ /dev/null @@ -1,305 +0,0 @@ -#!/bin/sh -# ---------------------------------------------------------------------------- -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you 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 -# -# 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. -# ---------------------------------------------------------------------------- - -# ---------------------------------------------------------------------------- -# Maven2 Start Up Batch script -# -# Required ENV vars: -# ------------------ -# JAVA_HOME - location of a JDK home dir -# -# Optional ENV vars -# ----------------- -# M2_HOME - location of maven2's installed home dir -# MAVEN_OPTS - parameters passed to the Java VM when running Maven -# e.g. to debug Maven itself, use -# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -# MAVEN_SKIP_RC - flag to disable loading of mavenrc files -# ---------------------------------------------------------------------------- - -if [ -z "$MAVEN_SKIP_RC" ] ; then - - if [ -f /etc/mavenrc ] ; then - . /etc/mavenrc - fi - - if [ -f "$HOME/.mavenrc" ] ; then - . "$HOME/.mavenrc" - fi - -fi - -# OS specific support. $var _must_ be set to either true or false. -cygwin=false; -darwin=false; -mingw=false -case "`uname`" in - CYGWIN*) cygwin=true ;; - MINGW*) mingw=true;; - Darwin*) darwin=true - # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home - # See https://developer.apple.com/library/mac/qa/qa1170/_index.html - if [ -z "$JAVA_HOME" ]; then - if [ -x "/usr/libexec/java_home" ]; then - export JAVA_HOME="`/usr/libexec/java_home`" - else - export JAVA_HOME="/Library/Java/Home" - fi - fi - ;; -esac - -if [ -z "$JAVA_HOME" ] ; then - if [ -r /etc/gentoo-release ] ; then - JAVA_HOME=`java-config --jre-home` - fi -fi - -if [ -z "$M2_HOME" ] ; then - ## resolve links - $0 may be a link to maven's home - PRG="$0" - - # need this for relative symlinks - while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG="`dirname "$PRG"`/$link" - fi - done - - saveddir=`pwd` - - M2_HOME=`dirname "$PRG"`/.. - - # make it fully qualified - M2_HOME=`cd "$M2_HOME" && pwd` - - cd "$saveddir" - # echo Using m2 at $M2_HOME -fi - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --unix "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --unix "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --unix "$CLASSPATH"` -fi - -# For Mingw, ensure paths are in UNIX format before anything is touched -if $mingw ; then - [ -n "$M2_HOME" ] && - M2_HOME="`(cd "$M2_HOME"; pwd)`" - [ -n "$JAVA_HOME" ] && - JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" -fi - -if [ -z "$JAVA_HOME" ]; then - javaExecutable="`which javac`" - if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then - # readlink(1) is not available as standard on Solaris 10. - readLink=`which readlink` - if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then - if $darwin ; then - javaHome="`dirname \"$javaExecutable\"`" - javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" - else - javaExecutable="`readlink -f \"$javaExecutable\"`" - fi - javaHome="`dirname \"$javaExecutable\"`" - javaHome=`expr "$javaHome" : '\(.*\)/bin'` - JAVA_HOME="$javaHome" - export JAVA_HOME - fi - fi -fi - -if [ -z "$JAVACMD" ] ; then - 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 - else - JAVACMD="`which java`" - fi -fi - -if [ ! -x "$JAVACMD" ] ; then - echo "Error: JAVA_HOME is not defined correctly." >&2 - echo " We cannot execute $JAVACMD" >&2 - exit 1 -fi - -if [ -z "$JAVA_HOME" ] ; then - echo "Warning: JAVA_HOME environment variable is not set." -fi - -CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher - -# traverses directory structure from process work directory to filesystem root -# first directory with .mvn subdirectory is considered project base directory -find_maven_basedir() { - - if [ -z "$1" ] - then - echo "Path not specified to find_maven_basedir" - return 1 - fi - - basedir="$1" - wdir="$1" - while [ "$wdir" != '/' ] ; do - if [ -d "$wdir"/.mvn ] ; then - basedir=$wdir - break - fi - # workaround for JBEAP-8937 (on Solaris 10/Sparc) - if [ -d "${wdir}" ]; then - wdir=`cd "$wdir/.."; pwd` - fi - # end of workaround - done - echo "${basedir}" -} - -# concatenates all lines of a file -concat_lines() { - if [ -f "$1" ]; then - echo "$(tr -s '\n' ' ' < "$1")" - fi -} - -BASE_DIR=`find_maven_basedir "$(pwd)"` -if [ -z "$BASE_DIR" ]; then - exit 1; -fi - -########################################################################################## -# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -# This allows using the maven wrapper in projects that prohibit checking in binary data. -########################################################################################## -if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found .mvn/wrapper/maven-wrapper.jar" - fi -else - if [ "$MVNW_VERBOSE" = true ]; then - echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." - fi - if [ "$MVNW_REPOURL" = true]; then - jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.2/maven-wrapper-0.5.2.jar" - else - jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.2/maven-wrapper-0.5.2.jar" - fi - while IFS="=" read key value; do - case "$key" in (wrapperUrl) jarUrl="$value"; break ;; - esac - done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" - if [ "$MVNW_VERBOSE" = true ]; then - echo "Downloading from: $jarUrl" - fi - wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" - if $cygwin; then - wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` - fi - - if command -v wget > /dev/null; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found wget ... using wget" - fi - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - wget "$jarUrl" -O "$wrapperJarPath" - else - wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" - fi - elif command -v curl > /dev/null; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found curl ... using curl" - fi - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - curl -o "$wrapperJarPath" "$jarUrl" -f - else - curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f - fi - - else - if [ "$MVNW_VERBOSE" = true ]; then - echo "Falling back to using Java to download" - fi - javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" - # For Cygwin, switch paths to Windows format before running javac - if $cygwin; then - javaClass=`cygpath --path --windows "$javaClass"` - fi - if [ -e "$javaClass" ]; then - if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then - if [ "$MVNW_VERBOSE" = true ]; then - echo " - Compiling MavenWrapperDownloader.java ..." - fi - # Compiling the Java class - ("$JAVA_HOME/bin/javac" "$javaClass") - fi - if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then - # Running the downloader - if [ "$MVNW_VERBOSE" = true ]; then - echo " - Running MavenWrapperDownloader.java ..." - fi - ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") - fi - fi - fi -fi -########################################################################################## -# End of extension -########################################################################################## - -export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} -if [ "$MVNW_VERBOSE" = true ]; then - echo $MAVEN_PROJECTBASEDIR -fi -MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --path --windows "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --windows "$CLASSPATH"` - [ -n "$MAVEN_PROJECTBASEDIR" ] && - MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` -fi - -WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -exec "$JAVACMD" \ - $MAVEN_OPTS \ - -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/spring-cli/projects/obaas/mvnw.cmd b/spring-cli/projects/obaas/mvnw.cmd deleted file mode 100755 index 4f5150ad..00000000 --- a/spring-cli/projects/obaas/mvnw.cmd +++ /dev/null @@ -1,172 +0,0 @@ -@REM ---------------------------------------------------------------------------- -@REM Licensed to the Apache Software Foundation (ASF) under one -@REM or more contributor license agreements. See the NOTICE file -@REM distributed with this work for additional information -@REM regarding copyright ownership. The ASF licenses this file -@REM to you under the Apache License, Version 2.0 (the -@REM "License"); you may not use this file except in compliance -@REM with the License. You may obtain a copy of the License at -@REM -@REM http://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, -@REM software distributed under the License is distributed on an -@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -@REM KIND, either express or implied. See the License for the -@REM specific language governing permissions and limitations -@REM under the License. -@REM ---------------------------------------------------------------------------- - -@REM ---------------------------------------------------------------------------- -@REM Maven2 Start Up Batch script -@REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir -@REM -@REM Optional ENV vars -@REM M2_HOME - location of maven2's installed home dir -@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands -@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending -@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven -@REM e.g. to debug Maven itself, use -@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files -@REM ---------------------------------------------------------------------------- - -@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' -@echo off -@REM set title of command window -title %0 -@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' -@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% - -@REM set %HOME% to equivalent of $HOME -if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") - -@REM Execute a user defined script before this one -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre -@REM check for pre script, once with legacy .bat ending and once with .cmd ending -if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" -if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" -:skipRcPre - -@setlocal - -set ERROR_CODE=0 - -@REM To isolate internal variables from possible post scripts, we use another setlocal -@setlocal - -@REM ==== START VALIDATION ==== -if not "%JAVA_HOME%" == "" goto OkJHome - -echo. -echo Error: JAVA_HOME not found in your environment. >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -:OkJHome -if exist "%JAVA_HOME%\bin\java.exe" goto init - -echo. -echo Error: JAVA_HOME is set to an invalid directory. >&2 -echo JAVA_HOME = "%JAVA_HOME%" >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -@REM ==== END VALIDATION ==== - -:init - -@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". -@REM Fallback to current working directory if not found. - -set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% -IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir - -set EXEC_DIR=%CD% -set WDIR=%EXEC_DIR% -:findBaseDir -IF EXIST "%WDIR%"\.mvn goto baseDirFound -cd .. -IF "%WDIR%"=="%CD%" goto baseDirNotFound -set WDIR=%CD% -goto findBaseDir - -:baseDirFound -set MAVEN_PROJECTBASEDIR=%WDIR% -cd "%EXEC_DIR%" -goto endDetectBaseDir - -:baseDirNotFound -set MAVEN_PROJECTBASEDIR=%EXEC_DIR% -cd "%EXEC_DIR%" - -:endDetectBaseDir - -IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig - -@setlocal EnableExtensions EnableDelayedExpansion -for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a -@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% - -:endReadAdditionalConfig - -SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" -set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" -set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.2/maven-wrapper-0.5.2.jar" - -FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( - IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B -) - -@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -@REM This allows using the maven wrapper in projects that prohibit checking in binary data. -if exist %WRAPPER_JAR% ( - echo Found %WRAPPER_JAR% -) else ( - if not "%MVNW_REPOURL%" == "" ( - SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.2/maven-wrapper-0.5.2.jar" - ) - echo Couldn't find %WRAPPER_JAR%, downloading it ... - echo Downloading from: %DOWNLOAD_URL% - - powershell -Command "&{"^ - "$webclient = new-object System.Net.WebClient;"^ - "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ - "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ - "}"^ - "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ - "}" - echo Finished downloading %WRAPPER_JAR% -) -@REM End of extension - -%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* -if ERRORLEVEL 1 goto error -goto end - -:error -set ERROR_CODE=1 - -:end -@endlocal & set ERROR_CODE=%ERROR_CODE% - -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost -@REM check for post script, once with legacy .bat ending and once with .cmd ending -if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" -if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" -:skipRcPost - -@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' -if "%MAVEN_BATCH_PAUSE%" == "on" pause - -if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% - -exit /B %ERROR_CODE% diff --git a/spring-cli/projects/obaas/pom.xml b/spring-cli/projects/obaas/pom.xml deleted file mode 100644 index 342f93f0..00000000 --- a/spring-cli/projects/obaas/pom.xml +++ /dev/null @@ -1,156 +0,0 @@ - - - 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 3.5.9 - - - - com.example - obaas-rest-service - 0.0.1-SNAPSHOT - - obaas-rest-service - RESTful web application for Oracle Backend for Microservices and AI - - - 21 - 2024.0.1 - 25.1.0 - 4.31.1 - 1.1.0 - - - - - - org.springframework.boot - spring-boot-starter-web - - - - - org.springframework.boot - spring-boot-starter-actuator - - - - - io.micrometer - micrometer-core - - - - - io.micrometer - micrometer-registry-prometheus - - - - - io.micrometer - micrometer-tracing-bridge-otel - - - - - io.opentelemetry - opentelemetry-exporter-otlp - - - - - io.micrometer - micrometer-tracing - - - - - org.springframework.cloud - spring-cloud-starter-netflix-eureka-client - - - - - org.springframework.boot - spring-boot-starter-data-jpa - - - - - - - com.oracle.database.spring - oracle-spring-boot-starter-ucp - ${oracle-springboot-starter.version} - pom - - - - - com.oracle.database.spring - oracle-spring-boot-starter-wallet - ${oracle-springboot-starter.version} - pom - - - - - - - - - org.liquibase - liquibase-core - - - - - net.ttddyy.observation - datasource-micrometer-spring-boot - ${datasource-micrometer-spring-boot.version} - - - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud.version} - pom - import - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - org.graalvm.buildtools - native-maven-plugin - - - - org.liquibase - liquibase-maven-plugin - - - - - diff --git a/spring-cli/projects/obaas/src/main/java/com/example/restservice/Application.java b/spring-cli/projects/obaas/src/main/java/com/example/restservice/Application.java deleted file mode 100644 index cac31c82..00000000 --- a/spring-cli/projects/obaas/src/main/java/com/example/restservice/Application.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.example.restservice; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -public class Application { - - public static void main(String[] args) { - SpringApplication.run(Application.class, args); - } - -} diff --git a/spring-cli/projects/obaas/src/main/java/com/example/restservice/controller/GreetingController.java b/spring-cli/projects/obaas/src/main/java/com/example/restservice/controller/GreetingController.java deleted file mode 100644 index 6456eba1..00000000 --- a/spring-cli/projects/obaas/src/main/java/com/example/restservice/controller/GreetingController.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.example.restservice.controller; - -import java.util.concurrent.atomic.AtomicLong; - -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import com.example.restservice.model.Greeting; - -@RestController -public class GreetingController { - - private static final String template = "Hello, %s!"; - private final AtomicLong counter = new AtomicLong(); - - /** - * Create and return greeting with a counter. - * - * @param name String name - * @return Returns Greeting record with optional name - */ - @GetMapping("/greeting") - public Greeting greeting(@RequestParam(defaultValue = "World") String name) { - return new Greeting(counter.incrementAndGet(), template.formatted(name)); - } - -} diff --git a/spring-cli/projects/obaas/src/main/java/com/example/restservice/model/Greeting.java b/spring-cli/projects/obaas/src/main/java/com/example/restservice/model/Greeting.java deleted file mode 100644 index 5c91ef95..00000000 --- a/spring-cli/projects/obaas/src/main/java/com/example/restservice/model/Greeting.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.example.restservice.model; - -public record Greeting (Long id, String Content){ -} diff --git a/spring-cli/projects/obaas/src/main/resources/application-local.yaml b/spring-cli/projects/obaas/src/main/resources/application-local.yaml deleted file mode 100644 index e58251c6..00000000 --- a/spring-cli/projects/obaas/src/main/resources/application-local.yaml +++ /dev/null @@ -1,98 +0,0 @@ -# -# This is an example Spring application.yaml configuration file for a -# Spring Boot application that can be deployed to Oracle Backend for -# Spring Boot and Microservices. -# -spring: - application: - name: restservice - threads: - virtual: - enabled: true - jpa: - hibernate: - ddl-auto: validate - properties: - hibernate: - dialect: org.hibernate.dialect.OracleDialect - format_sql: true - show-sql: true - - # This section configures Liquibase to automate the schema and reference - # data based on the definitions under src/main/resources/db/changelog. - # Comment out this section if you do not need Liquibase. - # Note that the variables used here will be injected into the deployment - # automatically when you deploy with oractl or the IDE plugins. - liquibase: - change-log: classpath:db/changelog/controller.yaml - url: ${spring.datasource.url} - user: ${liquibase.datasource.username} - password: ${liquibase.datasource.password} - enabled: ${LIQUIBASE_ENABLED:true} - - # This section configures an Oracle datasource using UCP. You can adjust - # the pool sizing parameters below in the oracleucp section. - # Note that the variables used here will be injected into the deployment - # automatically when you deploy with oractl or the IDE plugins. - datasource: - url: ${spring.datasource.url} - username: ${spring.datasource.username} - password: ${spring.datasource.password} - driver-class-name: oracle.jdbc.OracleDriver - type: oracle.ucp.jdbc.PoolDataSource - oracleucp: - connection-factory-class-name: oracle.jdbc.pool.OracleDataSource - connection-pool-name: SpringCLIConnectionPool - initial-pool-size: 15 - min-pool-size: 10 - max-pool-size: 30 - shared: true - -# This section configures service discovery using the Spring Cloud Eureka Service -# Registry that is automatically installed and configured in Oracle Backend for -# Spring Boot and Microservices. Note that it must be configured to use IP address -# not hostname since the deployment is in Kubernetes and the hostname allocated to -# pod will not match. -eureka: - instance: - hostname: ${spring.application.name} - preferIpAddress: true - client: - service-url: - defaultZone: ${eureka.service-url} - fetch-registry: false - register-with-eureka: false - enabled: false - -# This section configures tracing and metrics -management: - endpoint: - health: - show-details: always - endpoints: - web: - exposure: - include: "*" - metrics: - tags: - application: ${spring.application.name} - tracing: - sampling: - probability: 1.0 - info: - os: - enabled: true - env: - enabled: true - java: - enabled: true - otlp: - tracing: - endpoint: ${otel.exporter.otlp.endpoint} - export: - enabled: false - -logging: - level: - root: INFO - com.example: INFO \ No newline at end of file diff --git a/spring-cli/projects/obaas/src/main/resources/application.yaml b/spring-cli/projects/obaas/src/main/resources/application.yaml deleted file mode 100644 index ad8ed0d5..00000000 --- a/spring-cli/projects/obaas/src/main/resources/application.yaml +++ /dev/null @@ -1,96 +0,0 @@ -# -# This is an example Spring application.yaml configuration file for a -# Spring Boot application that can be deployed to Oracle Backend for -# Spring Boot and Microservices. -# -spring: - application: - name: restservice - threads: - virtual: - enabled: true - jpa: - hibernate: - ddl-auto: validate - properties: - hibernate: - dialect: org.hibernate.dialect.OracleDialect - format_sql: true - show-sql: true - - # This section configures Liquibase to automate the schema and reference - # data based on the definitions under src/main/resources/db/changelog. - # Comment out this section if you do not need Liquibase. - # Note that the variables used here will be injected into the deployment - # automatically when you deploy with oractl or the IDE plugins. - liquibase: - change-log: classpath:db/changelog/controller.yaml - url: ${spring.datasource.url} - user: ${liquibase.datasource.username} - password: ${liquibase.datasource.password} - enabled: ${LIQUIBASE_ENABLED:true} - - # This section configures an Oracle datasource using UCP. You can adjust - # the pool sizing parameters below in the oracleucp section. - # Note that the variables used here will be injected into the deployment - # automatically when you deploy with oractl or the IDE plugins. - datasource: - url: ${spring.datasource.url} - username: ${spring.datasource.username} - password: ${spring.datasource.password} - driver-class-name: oracle.jdbc.OracleDriver - type: oracle.ucp.jdbc.PoolDataSource - oracleucp: - connection-factory-class-name: oracle.jdbc.pool.OracleDataSource - connection-pool-name: SpringCLIConnectionPool - initial-pool-size: 15 - min-pool-size: 10 - max-pool-size: 30 - shared: true - -# This section configures service discovery using the Spring Cloud Eureka Service -# Registry that is automatically installed and configured in Oracle Backend for -# Spring Boot and Microservices. Note that it must be configured to use IP address -# not hostname since the deployment is in Kubernetes and the hostname allocated to -# pod will not match. -eureka: - instance: - hostname: ${spring.application.name} - preferIpAddress: true - client: - service-url: - defaultZone: ${eureka.service-url} - fetch-registry: true - register-with-eureka: true - enabled: true - -# This section configures tracing and metrics -management: - endpoint: - health: - show-details: always - endpoints: - web: - exposure: - include: "*" - metrics: - tags: - application: ${spring.application.name} - tracing: - sampling: - probability: 1.0 - info: - os: - enabled: true - env: - enabled: true - java: - enabled: true - otlp: - tracing: - endpoint: ${otel.exporter.otlp.endpoint} - -logging: - level: - root: INFO - com.example: INFO \ No newline at end of file diff --git a/spring-cli/projects/obaas/src/main/resources/db/changelog/controller.yaml b/spring-cli/projects/obaas/src/main/resources/db/changelog/controller.yaml deleted file mode 100644 index 5b11e0a0..00000000 --- a/spring-cli/projects/obaas/src/main/resources/db/changelog/controller.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -databaseChangeLog: - - include: - file: classpath:db/changelog/table.sql - - include: - file: classpath:db/changelog/data.sql \ No newline at end of file diff --git a/spring-cli/projects/obaas/src/main/resources/db/changelog/data.sql b/spring-cli/projects/obaas/src/main/resources/db/changelog/data.sql deleted file mode 100644 index 6bab8e44..00000000 --- a/spring-cli/projects/obaas/src/main/resources/db/changelog/data.sql +++ /dev/null @@ -1,10 +0,0 @@ --- liquibase formatted sql - --- changeset springcliapp:1 runAlways:true -truncate table mytable; - -insert into mytable (a,b,c,d) -values ('1','2','3','4'); -commit; - ---rollback DELETE FROM mytable; \ No newline at end of file diff --git a/spring-cli/projects/obaas/src/main/resources/db/changelog/table.sql b/spring-cli/projects/obaas/src/main/resources/db/changelog/table.sql deleted file mode 100644 index 0cfddef2..00000000 --- a/spring-cli/projects/obaas/src/main/resources/db/changelog/table.sql +++ /dev/null @@ -1,18 +0,0 @@ --- liquibase formatted sql - ---changeset springcliapp:1 ---preconditions onfail:MARK_RAN onerror:MARK_RAN ---precondition-sql-check expectedresult:0 select count(*) from mytable where 1=2 -drop table mytable; - ---changeset springcliapp:2 -create table mytable ( - a varchar2 (20), - b varchar2 (40), - c varchar2 (40), - d varchar2(40) -) logging; - -alter table mytable add constraint mytable_pk primary key (a) using index logging; - ---rollback drop table mytable; \ No newline at end of file diff --git a/spring-cli/projects/obaas/src/test/java/com/example/restservice/greeting/GreetingControllerTests.java b/spring-cli/projects/obaas/src/test/java/com/example/restservice/greeting/GreetingControllerTests.java deleted file mode 100644 index 734b7305..00000000 --- a/spring-cli/projects/obaas/src/test/java/com/example/restservice/greeting/GreetingControllerTests.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.example.restservice.greeting; - -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.web.servlet.MockMvc; - -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - -@SpringBootTest -@AutoConfigureMockMvc -public class GreetingControllerTests { - - @Autowired - private MockMvc mockMvc; - - @Test - public void noParamGreetingShouldReturnDefaultMessage() throws Exception { - mockMvc.perform(get("/greeting")) - .andExpect(status().isOk()) - .andExpect(jsonPath("$.id").value(1)) - .andExpect(jsonPath("$.Content").value("Hello, World!")); - - } - - @Test - public void paramGreetingShouldReturnTailoredMessage() throws Exception { - String name = "Spring Community"; - String expectedGreeting = "Hello, " + name + "!"; - - mockMvc.perform(get("/greeting").param("name", name)) - .andExpect(status().isOk()) - .andExpect(jsonPath("$.id").value(2)) - .andExpect(jsonPath("$.Content").value(expectedGreeting)); - } - -}