diff --git a/documentation/asciidoc/topics/ref_hotrod_java_tutorials.adoc b/documentation/asciidoc/topics/ref_hotrod_java_tutorials.adoc index a95c0a23..36e3fb98 100644 --- a/documentation/asciidoc/topics/ref_hotrod_java_tutorials.adoc +++ b/documentation/asciidoc/topics/ref_hotrod_java_tutorials.adoc @@ -29,6 +29,9 @@ |link:{repository}/infinispan-remote/programmatic-protostream-marshalling[Custom marshalling] |Demonstrates how custom marshalling works in the context of programmatically creating Protostream schemas and marshallers. Users should generally rely on annotations based generated Protostream marshallers unless exceptional circumstances require manual creation. +|link:{repository}/infinispan-remote/schemas[Protostream schemas administration] +|Demonstrates how to use the Administration API to manipulate the Protostream (protobuf format) schemas in {brandname}. + |link:{repository}/infinispan-remote/listeners[Client listeners] |Detect when data changes in a remote cache with Client Listeners. diff --git a/infinispan-embedded/query-programmatic-index/pom.xml b/infinispan-embedded/query-programmatic-index/pom.xml index ebd2d5b6..1928c35f 100644 --- a/infinispan-embedded/query-programmatic-index/pom.xml +++ b/infinispan-embedded/query-programmatic-index/pom.xml @@ -33,20 +33,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - - - - - - 21 - 21 - --enable-preview - - diff --git a/infinispan-remote/continuous-query/src/main/java/org/infinispan/tutorial/simple/remote/query/InfinispanRemoteContinuousQuery.java b/infinispan-remote/continuous-query/src/main/java/org/infinispan/tutorial/simple/remote/query/InfinispanRemoteContinuousQuery.java index 62252359..311d7470 100644 --- a/infinispan-remote/continuous-query/src/main/java/org/infinispan/tutorial/simple/remote/query/InfinispanRemoteContinuousQuery.java +++ b/infinispan-remote/continuous-query/src/main/java/org/infinispan/tutorial/simple/remote/query/InfinispanRemoteContinuousQuery.java @@ -1,5 +1,11 @@ package org.infinispan.tutorial.simple.remote.query; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Random; +import java.util.UUID; + import org.infinispan.client.hotrod.RemoteCache; import org.infinispan.client.hotrod.RemoteCacheManager; import org.infinispan.client.hotrod.configuration.ConfigurationBuilder; @@ -8,14 +14,6 @@ import org.infinispan.commons.api.query.Query; import org.infinispan.tutorial.simple.connect.TutorialsConnectorHelper; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Random; -import java.util.UUID; - -import static org.infinispan.query.remote.client.ProtobufMetadataManagerConstants.PROTOBUF_METADATA_CACHE_NAME; - /** * The Remote Continuous Query simple tutorial. * @@ -145,11 +143,6 @@ public static void disconnect() { } private static void register(InstaSchemaImpl schema, RemoteCacheManager cacheManager) { - // Retrieve metadata cache - RemoteCache metadataCache = - cacheManager.getCache(PROTOBUF_METADATA_CACHE_NAME); - - // register the new schema on the server too - metadataCache.putIfAbsent(schema.getProtoFileName(), schema.getProtoFile()); + cacheManager.administration().schemas().createOrUpdate(schema); } } diff --git a/infinispan-remote/persistence/sql-store/src/main/java/org/infinispan/tutorial/simple/remote/persistence/ProtostreamSchemaUploader.java b/infinispan-remote/persistence/sql-store/src/main/java/org/infinispan/tutorial/simple/remote/persistence/ProtostreamSchemaUploader.java index b1e5ec39..7f9cdb8e 100644 --- a/infinispan-remote/persistence/sql-store/src/main/java/org/infinispan/tutorial/simple/remote/persistence/ProtostreamSchemaUploader.java +++ b/infinispan-remote/persistence/sql-store/src/main/java/org/infinispan/tutorial/simple/remote/persistence/ProtostreamSchemaUploader.java @@ -1,13 +1,10 @@ package org.infinispan.tutorial.simple.remote.persistence; -import org.infinispan.client.hotrod.RemoteCache; import org.infinispan.client.hotrod.RemoteCacheManager; -import org.infinispan.protostream.GeneratedSchema; - -import static org.infinispan.query.remote.client.ProtobufMetadataManagerConstants.PROTOBUF_METADATA_CACHE_NAME; public class ProtostreamSchemaUploader { + public static final TechLibrarySchemaImpl TECH_LIBRARY_SCHEMA = new TechLibrarySchemaImpl(); private final RemoteCacheManager cacheManager; public ProtostreamSchemaUploader(RemoteCacheManager cacheManager) { @@ -15,16 +12,10 @@ public ProtostreamSchemaUploader(RemoteCacheManager cacheManager) { } public void registerSchema() { - RemoteCache metadataCache = - cacheManager.getCache(PROTOBUF_METADATA_CACHE_NAME); - GeneratedSchema schema = new TechLibrarySchemaImpl(); - metadataCache.put(schema.getProtoFileName(), schema.getProtoFile()); + cacheManager.administration().schemas().createOrUpdate(TECH_LIBRARY_SCHEMA); } public void unregisterSchema() { - RemoteCache metadataCache = - cacheManager.getCache(PROTOBUF_METADATA_CACHE_NAME); - GeneratedSchema schema = new TechLibrarySchemaImpl(); - metadataCache.remove(schema.getProtoFileName()); + cacheManager.administration().schemas().remove(TECH_LIBRARY_SCHEMA.getProtoFileName()); } } diff --git a/infinispan-remote/programmatic-protostream-marshalling/src/main/java/org/infinispan/tutorial/simple/remote/marshalling/InfinispanProgrammaticProtostreamMarshalling.java b/infinispan-remote/programmatic-protostream-marshalling/src/main/java/org/infinispan/tutorial/simple/remote/marshalling/InfinispanProgrammaticProtostreamMarshalling.java index 31130dcf..f75c0af2 100644 --- a/infinispan-remote/programmatic-protostream-marshalling/src/main/java/org/infinispan/tutorial/simple/remote/marshalling/InfinispanProgrammaticProtostreamMarshalling.java +++ b/infinispan-remote/programmatic-protostream-marshalling/src/main/java/org/infinispan/tutorial/simple/remote/marshalling/InfinispanProgrammaticProtostreamMarshalling.java @@ -1,6 +1,5 @@ package org.infinispan.tutorial.simple.remote.marshalling; -import static org.infinispan.query.remote.client.ProtobufMetadataManagerConstants.PROTOBUF_METADATA_CACHE_NAME; import static org.infinispan.tutorial.simple.connect.TutorialsConnectorHelper.TUTORIAL_CACHE_NAME; import java.time.YearMonth; @@ -73,12 +72,7 @@ static void manipulateCache() { } private static void registerMagazineSchemaInTheServer(RemoteCacheManager cacheManager) { - // Retrieve metadata cache - RemoteCache metadataCache = - cacheManager.getCache(PROTOBUF_METADATA_CACHE_NAME); - - // Define the new schema on the server too - metadataCache.put(schema.getName(), schema.toString()); + cacheManager.administration().schemas().createOrUpdate(schema); } public static void disconnect(boolean removeCaches) { diff --git a/infinispan-remote/query/src/main/java/org/infinispan/tutorial/simple/remote/query/InfinispanRemoteQuery.java b/infinispan-remote/query/src/main/java/org/infinispan/tutorial/simple/remote/query/InfinispanRemoteQuery.java index 326b4692..8b287e24 100644 --- a/infinispan-remote/query/src/main/java/org/infinispan/tutorial/simple/remote/query/InfinispanRemoteQuery.java +++ b/infinispan-remote/query/src/main/java/org/infinispan/tutorial/simple/remote/query/InfinispanRemoteQuery.java @@ -4,7 +4,6 @@ import org.infinispan.client.hotrod.RemoteCacheManager; import org.infinispan.client.hotrod.configuration.ConfigurationBuilder; import org.infinispan.commons.api.query.Query; -import org.infinispan.protostream.GeneratedSchema; import org.infinispan.tutorial.simple.connect.TutorialsConnectorHelper; import java.net.URI; @@ -12,8 +11,6 @@ import java.util.List; import java.util.Map; -import static org.infinispan.query.remote.client.ProtobufMetadataManagerConstants.PROTOBUF_METADATA_CACHE_NAME; - /** * The Remote Query simple tutorial. * @@ -148,12 +145,6 @@ public static void disconnect(boolean removeCaches) { record PersonDTO(String pseudo, String fullName){} private static void addPersonSchema(RemoteCacheManager cacheManager) { - // Retrieve metadata cache - RemoteCache metadataCache = - cacheManager.getCache(PROTOBUF_METADATA_CACHE_NAME); - - // Define the new schema on the server too - GeneratedSchema schema = new TutorialSchemaImpl(); - metadataCache.put(schema.getProtoFileName(), schema.getProtoFile()); + cacheManager.administration().schemas().createOrUpdate(new TutorialSchemaImpl()); } } diff --git a/infinispan-remote/schemas/.mvn/wrapper/maven-wrapper.jar b/infinispan-remote/schemas/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 00000000..cb28b0e3 Binary files /dev/null and b/infinispan-remote/schemas/.mvn/wrapper/maven-wrapper.jar differ diff --git a/infinispan-remote/schemas/.mvn/wrapper/maven-wrapper.properties b/infinispan-remote/schemas/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 00000000..5f0536eb --- /dev/null +++ b/infinispan-remote/schemas/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar diff --git a/infinispan-remote/schemas/mvnw b/infinispan-remote/schemas/mvnw new file mode 100755 index 00000000..66df2854 --- /dev/null +++ b/infinispan-remote/schemas/mvnw @@ -0,0 +1,308 @@ +#!/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 +# +# 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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.2.0 +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# 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 /usr/local/etc/mavenrc ] ; then + . /usr/local/etc/mavenrc + fi + + 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 + JAVA_HOME="$(/usr/libexec/java_home)"; export JAVA_HOME + else + JAVA_HOME="/Library/Java/Home"; export JAVA_HOME + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=$(java-config --jre-home) + fi +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -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 "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] && + JAVA_HOME="$(cd "$JAVA_HOME" || (echo "cannot cd into $JAVA_HOME."; exit 1); 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="$(\unset -f command 2>/dev/null; \command -v 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 + +# 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/.." || exit 1; pwd) + fi + # end of workaround + done + printf '%s' "$(cd "$basedir" || exit 1; pwd)" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + # Remove \r in case we run on Windows within Git Bash + # and check out the repository with auto CRLF management + # enabled. Otherwise, we may read lines that are delimited with + # \r\n and produce $'-Xarg\r' rather than -Xarg due to word + # splitting rules. + tr -s '\r\n' ' ' < "$1" + fi +} + +log() { + if [ "$MVNW_VERBOSE" = true ]; then + printf '%s\n' "$1" + fi +} + +BASE_DIR=$(find_maven_basedir "$(dirname "$0")") +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR +log "$MAVEN_PROJECTBASEDIR" + +########################################################################################## +# 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. +########################################################################################## +wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" +if [ -r "$wrapperJarPath" ]; then + log "Found $wrapperJarPath" +else + log "Couldn't find $wrapperJarPath, downloading it ..." + + if [ -n "$MVNW_REPOURL" ]; then + wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + else + wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + fi + while IFS="=" read -r key value; do + # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' ) + safeValue=$(echo "$value" | tr -d '\r') + case "$key" in (wrapperUrl) wrapperUrl="$safeValue"; break ;; + esac + done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" + log "Downloading from: $wrapperUrl" + + if $cygwin; then + wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath") + fi + + if command -v wget > /dev/null; then + log "Found wget ... using wget" + [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet" + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + else + wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + log "Found curl ... using curl" + [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent" + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" + else + curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" + fi + else + log "Falling back to using Java to download" + javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java" + javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaSource=$(cygpath --path --windows "$javaSource") + javaClass=$(cygpath --path --windows "$javaClass") + fi + if [ -e "$javaSource" ]; then + if [ ! -e "$javaClass" ]; then + log " - Compiling MavenWrapperDownloader.java ..." + ("$JAVA_HOME/bin/javac" "$javaSource") + fi + if [ -e "$javaClass" ]; then + log " - Running MavenWrapperDownloader.java ..." + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath" + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +# If specified, validate the SHA-256 sum of the Maven wrapper jar file +wrapperSha256Sum="" +while IFS="=" read -r key value; do + case "$key" in (wrapperSha256Sum) wrapperSha256Sum=$value; break ;; + esac +done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" +if [ -n "$wrapperSha256Sum" ]; then + wrapperSha256Result=false + if command -v sha256sum > /dev/null; then + if echo "$wrapperSha256Sum $wrapperJarPath" | sha256sum -c > /dev/null 2>&1; then + wrapperSha256Result=true + fi + elif command -v shasum > /dev/null; then + if echo "$wrapperSha256Sum $wrapperJarPath" | shasum -a 256 -c > /dev/null 2>&1; then + wrapperSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." + echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties." + exit 1 + fi + if [ $wrapperSha256Result = false ]; then + echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2 + echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2 + echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2 + exit 1 + fi +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 "$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 + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $*" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +# shellcheck disable=SC2086 # safe args +exec "$JAVACMD" \ + $MAVEN_OPTS \ + $MAVEN_DEBUG_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/infinispan-remote/schemas/mvnw.cmd b/infinispan-remote/schemas/mvnw.cmd new file mode 100644 index 00000000..95ba6f54 --- /dev/null +++ b/infinispan-remote/schemas/mvnw.cmd @@ -0,0 +1,205 @@ +@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 https://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 Apache Maven Wrapper startup batch script, version 3.2.0 +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@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 keystroke 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 by 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 "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\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 WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET WRAPPER_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% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %WRAPPER_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('%WRAPPER_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM If specified, validate the SHA-256 sum of the Maven wrapper jar file +SET WRAPPER_SHA_256_SUM="" +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperSha256Sum" SET WRAPPER_SHA_256_SUM=%%B +) +IF NOT %WRAPPER_SHA_256_SUM%=="" ( + powershell -Command "&{"^ + "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^ + "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^ + " Write-Output 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^ + " Write-Output 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^ + " Write-Output 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^ + " exit 1;"^ + "}"^ + "}" + if ERRORLEVEL 1 goto error +) + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%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 "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\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% + +cmd /C exit /B %ERROR_CODE% diff --git a/infinispan-remote/schemas/pom.xml b/infinispan-remote/schemas/pom.xml new file mode 100644 index 00000000..b8e7dbcc --- /dev/null +++ b/infinispan-remote/schemas/pom.xml @@ -0,0 +1,56 @@ + + + 4.0.0 + infinispan-simple-tutorials-schemas-admin + + ../../pom.xml + 16.0.0-SNAPSHOT + org.infinispan.tutorial.simple + infinispan-simple-tutorials + + Infinispan Simple Tutorials: Schemas Administration + + + + + org.codehaus.mojo + exec-maven-plugin + + + + exec + + + + + java + + -Djava.net.preferIPv4Stack=true + -Djava.util.logging.config.file=src/main/resources/logging.properties + -classpath + + org.infinispan.tutorial.simple.server.schemas.InfinispanSchemasAdmin + + + + + + + + + org.infinispan.tutorial.simple + connect-to-infinispan-server + ${project.version} + + + org.infinispan + infinispan-client-hotrod + + + org.junit.jupiter + junit-jupiter + test + + + + diff --git a/infinispan-remote/schemas/src/main/java/org/infinispan/tutorial/simple/server/schemas/InfinispanSchemasAdmin.java b/infinispan-remote/schemas/src/main/java/org/infinispan/tutorial/simple/server/schemas/InfinispanSchemasAdmin.java new file mode 100644 index 00000000..f97fca17 --- /dev/null +++ b/infinispan-remote/schemas/src/main/java/org/infinispan/tutorial/simple/server/schemas/InfinispanSchemasAdmin.java @@ -0,0 +1,90 @@ +package org.infinispan.tutorial.simple.server.schemas; + +import java.util.Optional; + +import org.infinispan.client.hotrod.RemoteCacheManager; +import org.infinispan.client.hotrod.RemoteSchemasAdmin; +import org.infinispan.protostream.schema.Schema; +import org.infinispan.protostream.schema.Type; +import org.infinispan.tutorial.simple.connect.TutorialsConnectorHelper; + +/** + * Demonstrates how to use the Schema Admin API in hotrod. + * Schemas can also be manipulated via the CLI, + * the Server Web Console or directly with the REST API. + * + * @since 16.0 + */ +public class InfinispanSchemasAdmin { + static RemoteCacheManager remoteCacheManager; + static RemoteSchemasAdmin schemasAdmin; + static final String SCHEMA_NAME = "simple_tuto_hello.proto"; + + public static void main(String[] args) { + connectToInfinispan(); + + RemoteSchemasAdmin.SchemaOpResult result = createSchemaWithError(); + System.out.println("Schema op type: " + result.getType()); + System.out.println("Has error: " + result.hasError()); + System.out.println("Error: " + result.getError()); + + result = updateSchemaWithCorrections(); + System.out.println("Schema op type: " + result.getType()); + System.out.println("Has error: " + result.hasError()); + System.out.println("Error: " + result.getError()); + + System.out.println("Get schema named " + SCHEMA_NAME); + Optional schemaOpt = getOptionalSchema(); + if (schemaOpt.isPresent()) { + System.out.println("Schema Content: " + schemaOpt.get().getContent()); + } + + result = removeSchema(); + System.out.println("Schema op type: " + result.getType()); + + boolean exists = schemaExists(); + System.out.println("Schema still exists ? " + exists); + + disconnect(); + } + + static RemoteSchemasAdmin.SchemaOpResult createSchemaWithError() { + return schemasAdmin.createOrUpdate(Schema. + buildFromStringContent(SCHEMA_NAME, "What is love?")); + } + + static RemoteSchemasAdmin.SchemaOpResult updateSchemaWithCorrections() { + Schema schema = new Schema.Builder(SCHEMA_NAME) + .packageName("hello") + .addMessage("Greeting") + .addField(Type.Scalar.STRING, "content", 1) + .build(); + return schemasAdmin.createOrUpdate(schema); + } + + static Optional getOptionalSchema() { + Optional schemaOpt = schemasAdmin.get(SCHEMA_NAME); + return schemaOpt; + } + + static RemoteSchemasAdmin.SchemaOpResult removeSchema() { + RemoteSchemasAdmin.SchemaOpResult result; + result = schemasAdmin.remove(SCHEMA_NAME); + return result; + } + + static boolean schemaExists() { + return schemasAdmin.exists(SCHEMA_NAME); + } + + static void connectToInfinispan() { + // Connect to the server + remoteCacheManager = TutorialsConnectorHelper.connect(); + schemasAdmin = remoteCacheManager.administration().schemas(); + } + + static void disconnect() { + // Stop the cache manager and release all resources + TutorialsConnectorHelper.stop(remoteCacheManager); + } +} diff --git a/infinispan-remote/schemas/src/test/java/org/infinispan/tutorial/simple/server/schemas/InfinispanSchemasAdminTest.java b/infinispan-remote/schemas/src/test/java/org/infinispan/tutorial/simple/server/schemas/InfinispanSchemasAdminTest.java new file mode 100644 index 00000000..2c2d7894 --- /dev/null +++ b/infinispan-remote/schemas/src/test/java/org/infinispan/tutorial/simple/server/schemas/InfinispanSchemasAdminTest.java @@ -0,0 +1,38 @@ +package org.infinispan.tutorial.simple.server.schemas; + + +import static org.infinispan.client.hotrod.RemoteSchemasAdmin.SchemaOpResultType.CREATED; +import static org.infinispan.client.hotrod.RemoteSchemasAdmin.SchemaOpResultType.UPDATED; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.infinispan.client.hotrod.RemoteSchemasAdmin; +import org.junit.Test; + +public class InfinispanSchemasAdminTest { + + @Test + public void testSchemasCRUD() { + InfinispanSchemasAdmin.connectToInfinispan(); + assertNotNull(InfinispanSchemasAdmin.schemasAdmin); + + InfinispanSchemasAdmin.removeSchema(); + assertFalse(InfinispanSchemasAdmin.schemaExists()); + + RemoteSchemasAdmin.SchemaOpResult schemaWithError = InfinispanSchemasAdmin.createSchemaWithError(); + assertEquals(CREATED, schemaWithError.getType()); + assertTrue(schemaWithError.hasError()); + assertTrue(schemaWithError.getError().contains("Syntax error")); + + RemoteSchemasAdmin.SchemaOpResult schemaCorrect = InfinispanSchemasAdmin.updateSchemaWithCorrections(); + assertEquals(UPDATED, schemaCorrect.getType()); + assertFalse(schemaCorrect.hasError()); + + assertTrue(InfinispanSchemasAdmin.schemaExists()); + assertTrue(InfinispanSchemasAdmin.getOptionalSchema().isPresent()); + + InfinispanSchemasAdmin.disconnect(); + } +} \ No newline at end of file diff --git a/infinispan-remote/spatial-queries/src/main/java/org/infinispan/tutorial/simple/remote/spatial/InfinispanSpatialQueries.java b/infinispan-remote/spatial-queries/src/main/java/org/infinispan/tutorial/simple/remote/spatial/InfinispanSpatialQueries.java index 2d71e4e3..85d99d33 100644 --- a/infinispan-remote/spatial-queries/src/main/java/org/infinispan/tutorial/simple/remote/spatial/InfinispanSpatialQueries.java +++ b/infinispan-remote/spatial-queries/src/main/java/org/infinispan/tutorial/simple/remote/spatial/InfinispanSpatialQueries.java @@ -1,7 +1,5 @@ package org.infinispan.tutorial.simple.remote.spatial; -import static org.infinispan.query.remote.client.ProtobufMetadataManagerConstants.PROTOBUF_METADATA_CACHE_NAME; - import java.net.URI; import java.util.List; @@ -215,13 +213,8 @@ public static void disconnect(boolean removeCaches) { } private static void addProtoSchema(RemoteCacheManager cacheManager) { - // Retrieve metadata cache - RemoteCache metadataCache = - cacheManager.getCache(PROTOBUF_METADATA_CACHE_NAME); - // Define the new schema on the server too - GeneratedSchema schema = new TutorialSchemaImpl(); - metadataCache.put(schema.getProtoFileName(), schema.getProtoFile()); + cacheManager.administration().schemas().createOrUpdate(new TutorialSchemaImpl()); } record RestaurantDTO(String name, Double distance){} diff --git a/integrations/spring-boot/cache-remote-reactor/src/main/java/org/infinispan/tutorial/simple/spring/remote/Reader.java b/integrations/spring-boot/cache-remote-reactor/src/main/java/org/infinispan/tutorial/simple/spring/remote/Reader.java index 8d797787..65b4b076 100644 --- a/integrations/spring-boot/cache-remote-reactor/src/main/java/org/infinispan/tutorial/simple/spring/remote/Reader.java +++ b/integrations/spring-boot/cache-remote-reactor/src/main/java/org/infinispan/tutorial/simple/spring/remote/Reader.java @@ -1,19 +1,13 @@ package org.infinispan.tutorial.simple.spring.remote; -import org.infinispan.client.hotrod.RemoteCache; +import java.lang.invoke.MethodHandles; +import java.util.Random; + import org.infinispan.client.hotrod.RemoteCacheManager; -import org.infinispan.protostream.GeneratedSchema; -import org.infinispan.query.remote.client.ProtobufMetadataManagerConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import reactor.core.Disposable; -import reactor.core.publisher.Mono; - -import java.lang.invoke.MethodHandles; -import java.time.Duration; -import java.util.Random; @Component public class Reader { @@ -29,9 +23,7 @@ public Reader(BasqueNamesRepository repository, RemoteCacheManager remoteCacheMa random = new Random(); this.remoteCacheManager = remoteCacheManager; // Upload the generated schema in the server - RemoteCache metadataCache = this.remoteCacheManager.getCache(ProtobufMetadataManagerConstants.PROTOBUF_METADATA_CACHE_NAME); - GeneratedSchema schema = new BasquesNamesSchemaBuilderImpl(); - metadataCache.put(schema.getProtoFileName(), schema.getProtoFile()); + remoteCacheManager.administration().schemas().createOrUpdate(new BasquesNamesSchemaBuilderImpl()); } @Scheduled(fixedDelay = 10000) diff --git a/integrations/spring-boot/cache-remote/src/main/java/org/infinispan/tutorial/simple/spring/remote/Reader.java b/integrations/spring-boot/cache-remote/src/main/java/org/infinispan/tutorial/simple/spring/remote/Reader.java index 1e276703..c65ae926 100644 --- a/integrations/spring-boot/cache-remote/src/main/java/org/infinispan/tutorial/simple/spring/remote/Reader.java +++ b/integrations/spring-boot/cache-remote/src/main/java/org/infinispan/tutorial/simple/spring/remote/Reader.java @@ -1,17 +1,14 @@ package org.infinispan.tutorial.simple.spring.remote; -import org.infinispan.client.hotrod.RemoteCache; +import java.lang.invoke.MethodHandles; +import java.util.Random; + import org.infinispan.client.hotrod.RemoteCacheManager; -import org.infinispan.protostream.GeneratedSchema; -import org.infinispan.query.remote.client.ProtobufMetadataManagerConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import java.lang.invoke.MethodHandles; -import java.util.Random; - @Component public class Reader { @@ -26,9 +23,7 @@ public Reader(BasqueNamesRepository repository, RemoteCacheManager remoteCacheMa random = new Random(); this.remoteCacheManager = remoteCacheManager; // Upload the generated schema in the server - RemoteCache metadataCache = this.remoteCacheManager.getCache(ProtobufMetadataManagerConstants.PROTOBUF_METADATA_CACHE_NAME); - GeneratedSchema schema = new BasquesNamesSchemaBuilderImpl(); - metadataCache.put(schema.getProtoFileName(), schema.getProtoFile()); + remoteCacheManager.administration().schemas().createOrUpdate(new BasquesNamesSchemaBuilderImpl()); } @Scheduled(fixedDelay = 10000) diff --git a/pom.xml b/pom.xml index 4f79119e..036984ee 100644 --- a/pom.xml +++ b/pom.xml @@ -126,6 +126,7 @@ infinispan-remote/cross-site-replication infinispan-remote/opentelemetry infinispan-remote/spatial-queries + infinispan-remote/schemas infinispan-embedded/cache-alias infinispan-embedded/cache-distributed infinispan-embedded/cache-invalidated