--- /dev/null	2017-11-09 09:38:01.297999907 +0100
+++ new/test/jdk/jdk/jfr/api/metadata/settingdescriptor/AnnotatedSetting.java	2018-04-09 16:57:58.271467852 +0200
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jfr.api.metadata.settingdescriptor;
+
+import java.util.Set;
+
+import jdk.jfr.Description;
+import jdk.jfr.Label;
+import jdk.jfr.Name;
+import jdk.jfr.SettingControl;
+import jdk.jfr.Timestamp;
+
+@Name(AnnotatedSetting.NAME)
+@Label(AnnotatedSetting.LABEL)
+@Description(AnnotatedSetting.DESCRIPTION)
+@Timestamp(Timestamp.TICKS)
+public class AnnotatedSetting extends SettingControl {
+
+    public final static String LABEL = "Annotated Label";
+    public final static String DESCRIPTION = "Description of an annotated setting";
+    public final static String NAME = "annotatedType";
+    public final static String DEFAULT_VALUE = "defaultAnnotated";
+
+    @Override
+    public String combine(Set<String> settingValues) {
+        return DEFAULT_VALUE;
+    }
+
+    @Override
+    public void setValue(String settingValue) {
+    }
+
+    @Override
+    public String getValue() {
+        return DEFAULT_VALUE;
+    }
+
+}