Skip to content

Commit

Permalink
Make the composite writer use a class (#6)
Browse files Browse the repository at this point in the history
* Make the composite writer use a class

* Add description elsewhere

* Update
  • Loading branch information
wsargent authored Dec 29, 2019
1 parent e6ff035 commit f366747
Show file tree
Hide file tree
Showing 14 changed files with 545 additions and 156 deletions.
61 changes: 20 additions & 41 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,42 +92,26 @@ You can also specify composite data more generally and build up a mapping of dat
```java
public class CompositeExample {

static class CompositeItemBean<T> {
private final CompositeDataWriter<T> compositeBuilder;
private final Supplier<T> itemSupplier;

public CompositeItemBean(CompositeDataWriter<T> compositeBuilder, Supplier<T> itemSupplier) {
this.itemSupplier = itemSupplier;
this.compositeBuilder = compositeBuilder;
}

public CompositeData getItem() {
return compositeBuilder.apply(itemSupplier.get());
}
}

static final CompositeDataWriter<Address> addressWriter = CompositeDataWriter.<Address>builder()
static final CompositeDataWriter<Address> addressWriter = CompositeDataWriter.builder(Address.class)
.withTypeName("address")
.withTypeDescription("Address")
.withSimpleAttribute("street1", "Street 1", Address::getStreet1)
.withSimpleAttribute("city", "City", Address::getCity)
.withSimpleAttribute("state", "State", Address::getState)
.withSimpleAttribute(String.class, "street1", "Street 1", Address::getStreet1)
.withSimpleAttribute("city", Address::getCity)
.withSimpleAttribute("state", Address::getState)
.build();

static final CompositeDataWriter<User> userWriter = CompositeDataWriter.<User>builder()
.withTypeName("user")
.withTypeDescription("User")
.withSimpleAttribute("name", "Name", User::getName)
.withSimpleAttribute("age", "Age", User::getAge)
.withCompositeAttribute("address", "Address", User::getAddress, addressWriter).build();
static final CompositeDataWriter<User> userWriter = CompositeDataWriter.builder(User.class)
.withTypeName("user")
.withTypeDescription("User")
.withSimpleAttribute("name", User::getName)
.withSimpleAttribute("age", User::getAge)
.withCompositeAttribute("address", user -> user.getAddress(), addressWriter).build();

public static void compositeBean() throws Exception {
final Address address = new Address("street1", "city", "state");
final User user = new User("name", 12, address);
final CompositeItemBean<User> compositeItemBean = new CompositeItemBean<>(userWriter, () -> user);

final DynamicMBean userBean = DynamicBean.builder()
.withSimpleAttribute("User", compositeItemBean::getItem)
.withCompositeAttribute("User", () -> user, userWriter)
.build();

ObjectName objectName = new ObjectName("com.tersesystems:type=DynamicBean,name=CompositeBean");
Expand All @@ -136,6 +120,7 @@ public class CompositeExample {
final CompositeData userItem = (CompositeData) mBeanServer.getAttribute(objectName, "User");
printUser(userItem);
}

}
```

Expand All @@ -147,27 +132,21 @@ We can also do lists of users, using the same writers we defined earlier and map

```java
public class TabularExample {
static class TabularItemBean<T> {
private final Supplier<Iterable<T>> itemsSupplier;
private final TabularDataWriter<T> builder;

public TabularItemBean(TabularDataWriter<T> builder, Supplier<Iterable<T>> items) {
this.builder = builder;
this.itemsSupplier = items;
}
// ... composite writers as above

public TabularData getItem() {
return builder.apply(itemsSupplier.get());
}
}
static final TabularDataWriter<User> usersWriter = TabularDataWriter.builder(User.class)
.withTypeName("users")
.withTypeDescription("Users")
.withIndexName("name")
.withCompositeDataWriter(userWriter)
.build();

public static void tabularBean() throws Exception {
final Address address = new Address("street1", "city", "state");
final List<User> usersList = Collections.singletonList(new User("name", 12, address));

TabularItemBean<User> tabularItemBean = new TabularItemBean<>(usersWriter, () -> usersList);
final DynamicMBean usersBean = DynamicBean.builder()
.withSimpleAttribute("Users", tabularItemBean::getItem)
.withTabularAttribute("Users", () -> usersList, usersWriter)
.build();

ObjectName objectName = new ObjectName("com.tersesystems:type=DynamicBean,name=TabularBean");
Expand Down
2 changes: 1 addition & 1 deletion examples/basic/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dependencies {
//api group: 'org.slf4j', name: 'slf4j-api', version: '1.7.29'

// run "gradle publishToMavenLocal" to make sure this is here
implementation "com.tersesystems.jmxbuilder:jmxbuilder:0.0.2"
implementation "com.tersesystems.jmxbuilder:jmxbuilder:0.0.3"
}

java {
Expand Down
Binary file added examples/basic/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
6 changes: 6 additions & 0 deletions examples/basic/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#Sun Dec 29 12:32:34 PST 2019
distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
172 changes: 172 additions & 0 deletions examples/basic/gradlew
Original file line number Diff line number Diff line change
@@ -0,0 +1,172 @@
#!/usr/bin/env sh

##############################################################################
##
## Gradle start up script for UN*X
##
##############################################################################

# Attempt to set APP_HOME
# Resolve links: $0 may be a link
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
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null

APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`

# 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"'

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"

warn () {
echo "$*"
}

die () {
echo
echo "$*"
echo
exit 1
}

# 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
;;
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"
which java >/dev/null 2>&1 || 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

# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
MAX_FD="$MAX_FD_LIMIT"
fi
ulimit -n $MAX_FD
if [ $? -ne 0 ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi

# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi

# For Cygwin, switch paths to Windows format before running java
if $cygwin ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`

# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
SEP=""
for dir in $ROOTDIRSRAW ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option

if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
fi
i=$((i+1))
done
case $i in
(0) set -- ;;
(1) set -- "$args0" ;;
(2) set -- "$args0" "$args1" ;;
(3) set -- "$args0" "$args1" "$args2" ;;
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi

# Escape application args
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
APP_ARGS=$(save "$@")

# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"

# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
cd "$(dirname "$0")"
fi

exec "$JAVACMD" "$@"
84 changes: 84 additions & 0 deletions examples/basic/gradlew.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
@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=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

@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"

@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome

set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto init

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.

goto fail

:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto init

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.

goto fail

:init
@rem Get command-line arguments, handling Windows variants

if not "%OS%" == "Windows_NT" goto win9xME_args

:win9xME_args
@rem Slurp the command line arguments.
set CMD_LINE_ARGS=
set _SKIP=2

:win9xME_args_slurp
if "x%~1" == "x" goto execute

set CMD_LINE_ARGS=%*

: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 %CMD_LINE_ARGS%

:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="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!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1

:mainEnd
if "%OS%"=="Windows_NT" endlocal

:omega
2 changes: 1 addition & 1 deletion examples/basic/src/main/java/example/Address.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.tersesystems.jmxbuilder.model;
package example;

import static java.lang.String.format;

Expand Down
Loading

0 comments on commit f366747

Please sign in to comment.