This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new cebd9cf Context API refactoring.
cebd9cf is described below
commit cebd9cf543d23e0255888015d5acfe6d17dd6b32
Author: JamesBognar <james.bog...@salesforce.com>
AuthorDate: Sun Sep 26 19:36:04 2021 -0400
Context API refactoring.
---
.../main/java/org/apache/juneau/csv/CsvCommon.java | 24 ----------------------
.../main/java/org/apache/juneau/csv/CsvParser.java | 2 +-
.../java/org/apache/juneau/csv/CsvSerializer.java | 2 +-
.../java/org/apache/juneau/html/HtmlCommon.java | 24 ----------------------
.../java/org/apache/juneau/html/HtmlParser.java | 11 ++--------
.../org/apache/juneau/html/HtmlSerializer.java | 2 +-
.../main/java/org/apache/juneau/jso/JsoCommon.java | 24 ----------------------
.../main/java/org/apache/juneau/jso/JsoParser.java | 10 ++-------
.../java/org/apache/juneau/jso/JsoSerializer.java | 10 ++-------
.../java/org/apache/juneau/json/JsonCommon.java | 24 ----------------------
.../java/org/apache/juneau/json/JsonParser.java | 2 +-
.../org/apache/juneau/json/JsonSerializer.java | 2 +-
.../org/apache/juneau/msgpack/MsgPackCommon.java | 24 ----------------------
.../org/apache/juneau/msgpack/MsgPackParser.java | 2 +-
.../apache/juneau/msgpack/MsgPackSerializer.java | 2 +-
.../apache/juneau/plaintext/PlainTextCommon.java | 24 ----------------------
.../apache/juneau/plaintext/PlainTextParser.java | 2 +-
.../juneau/plaintext/PlainTextSerializer.java | 2 +-
.../java/org/apache/juneau/soap/SoapXmlCommon.java | 24 ----------------------
.../org/apache/juneau/soap/SoapXmlSerializer.java | 2 +-
.../main/java/org/apache/juneau/uon/UonCommon.java | 24 ----------------------
.../main/java/org/apache/juneau/uon/UonParser.java | 2 +-
.../java/org/apache/juneau/uon/UonSerializer.java | 2 +-
.../juneau/urlencoding/UrlEncodingCommon.java | 24 ----------------------
.../juneau/urlencoding/UrlEncodingParser.java | 2 +-
.../juneau/urlencoding/UrlEncodingSerializer.java | 2 +-
.../main/java/org/apache/juneau/xml/XmlCommon.java | 24 ----------------------
.../main/java/org/apache/juneau/xml/XmlParser.java | 2 +-
.../java/org/apache/juneau/xml/XmlSerializer.java | 2 +-
29 files changed, 22 insertions(+), 281 deletions(-)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvCommon.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvCommon.java
deleted file mode 100644
index 1e7dc88..0000000
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvCommon.java
+++ /dev/null
@@ -1,24 +0,0 @@
-//
***************************************************************************************************************************
-// * 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. *
-//
***************************************************************************************************************************
-package org.apache.juneau.csv;
-
-/**
- * Configurable properties common to both the {@link CsvSerializer} and {@link
CsvParser} classes.
- */
-public interface CsvCommon {
-
- /**
- * Property prefix.
- */
- static final String PREFIX = "Csv";
-}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParser.java
index 1d99948..1168a18 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParser.java
@@ -24,7 +24,7 @@ import org.apache.juneau.parser.*;
* TODO - Work in progress. CSV parser.
*/
@ConfigurableContext
-public class CsvParser extends ReaderParser implements CsvMetaProvider,
CsvCommon {
+public class CsvParser extends ReaderParser implements CsvMetaProvider {
//-------------------------------------------------------------------------------------------------------------------
// Static
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializer.java
index 69e56ae..21a13ff 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializer.java
@@ -24,7 +24,7 @@ import org.apache.juneau.serializer.*;
* TODO - Work in progress. CSV serializer.
*/
@ConfigurableContext
-public final class CsvSerializer extends WriterSerializer implements
CsvMetaProvider,CsvCommon {
+public final class CsvSerializer extends WriterSerializer implements
CsvMetaProvider {
//-------------------------------------------------------------------------------------------------------------------
// Static
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlCommon.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlCommon.java
deleted file mode 100644
index 74899d6..0000000
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlCommon.java
+++ /dev/null
@@ -1,24 +0,0 @@
-//
***************************************************************************************************************************
-// * 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. *
-//
***************************************************************************************************************************
-package org.apache.juneau.html;
-
-/**
- * Configurable properties common to both the {@link HtmlSerializer} and
{@link HtmlParser} classes.
- */
-public interface HtmlCommon {
-
- /**
- * Property prefix.
- */
- static final String PREFIX = "Html";
-}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParser.java
index 3eda8f7..3ca52b4 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParser.java
@@ -35,22 +35,15 @@ import org.apache.juneau.xml.*;
* This class is used primarily for automated testing of the {@link
HtmlSerializer} class.
*/
@ConfigurableContext
-public class HtmlParser extends XmlParser implements HtmlMetaProvider,
HtmlCommon {
+public class HtmlParser extends XmlParser implements HtmlMetaProvider {
//-------------------------------------------------------------------------------------------------------------------
- // Configurable properties
-
//-------------------------------------------------------------------------------------------------------------------
-
- static final String PREFIX = "HtmlParser";
-
-
//-------------------------------------------------------------------------------------------------------------------
- // Predefined instances
+ // Static
//-------------------------------------------------------------------------------------------------------------------
/** Default parser, all default settings.*/
public static final HtmlParser DEFAULT = new HtmlParser(create());
-
//-------------------------------------------------------------------------------------------------------------------
// Instance
//-------------------------------------------------------------------------------------------------------------------
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
index a251430..1e568f0 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
@@ -128,7 +128,7 @@ import org.apache.juneau.xml.*;
* </p>
*/
@ConfigurableContext
-public class HtmlSerializer extends XmlSerializer implements HtmlMetaProvider,
HtmlCommon {
+public class HtmlSerializer extends XmlSerializer implements HtmlMetaProvider {
//-------------------------------------------------------------------------------------------------------------------
// Static
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoCommon.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoCommon.java
deleted file mode 100644
index 5500a7e..0000000
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoCommon.java
+++ /dev/null
@@ -1,24 +0,0 @@
-//
***************************************************************************************************************************
-// * 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. *
-//
***************************************************************************************************************************
-package org.apache.juneau.jso;
-
-/**
- * Configurable properties common to both the {@link JsoSerializer} and {@link
JsoParser} classes.
- */
-public interface JsoCommon {
-
- /**
- * Property prefix.
- */
- static final String PREFIX = "Jso";
-}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoParser.java
index 45204fc..23afde4 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoParser.java
@@ -29,16 +29,10 @@ import org.apache.juneau.parser.*;
* Consumes <c>Content-Type</c> types:
<bc>application/x-java-serialized-object</bc>
*/
@ConfigurableContext
-public final class JsoParser extends InputStreamParser implements
JsoMetaProvider, JsoCommon {
+public final class JsoParser extends InputStreamParser implements
JsoMetaProvider {
//-------------------------------------------------------------------------------------------------------------------
- // Configurable properties
-
//-------------------------------------------------------------------------------------------------------------------
-
- static final String PREFIX = "JsoParser";
-
-
//-------------------------------------------------------------------------------------------------------------------
- // Predefined instances
+ // Static
//-------------------------------------------------------------------------------------------------------------------
/** Default parser, all default settings.*/
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoSerializer.java
index 1e7fa6e..4d0e0d4 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoSerializer.java
@@ -31,16 +31,10 @@ import org.apache.juneau.serializer.*;
* Produces <c>Content-Type</c> types:
<bc>application/x-java-serialized-object</bc>
*/
@ConfigurableContext
-public class JsoSerializer extends OutputStreamSerializer implements
JsoMetaProvider, JsoCommon {
+public class JsoSerializer extends OutputStreamSerializer implements
JsoMetaProvider {
//-------------------------------------------------------------------------------------------------------------------
- // Configurable properties
-
//-------------------------------------------------------------------------------------------------------------------
-
- static final String PREFIX = "JsoSerializer";
-
-
//-------------------------------------------------------------------------------------------------------------------
- // Predefined instances
+ // Static
//-------------------------------------------------------------------------------------------------------------------
/** Default serializer, all default settings.*/
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonCommon.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonCommon.java
deleted file mode 100644
index f781982..0000000
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonCommon.java
+++ /dev/null
@@ -1,24 +0,0 @@
-//
***************************************************************************************************************************
-// * 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. *
-//
***************************************************************************************************************************
-package org.apache.juneau.json;
-
-/**
- * Configurable properties common to both the {@link JsonSerializer} and
{@link JsonParser} classes.
- */
-public interface JsonCommon {
-
- /**
- * Property prefix.
- */
- static final String PREFIX = "Json";
-}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParser.java
index afa51d3..2e53ad5 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParser.java
@@ -105,7 +105,7 @@ import org.apache.juneau.parser.*;
* The end result should be the same.
*/
@ConfigurableContext
-public class JsonParser extends ReaderParser implements JsonMetaProvider,
JsonCommon {
+public class JsonParser extends ReaderParser implements JsonMetaProvider {
//-------------------------------------------------------------------------------------------------------------------
// Static
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
index aab6610..2cd0f18 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
@@ -91,7 +91,7 @@ import org.apache.juneau.serializer.*;
* </p>
*/
@ConfigurableContext
-public class JsonSerializer extends WriterSerializer implements
JsonMetaProvider, JsonCommon {
+public class JsonSerializer extends WriterSerializer implements
JsonMetaProvider {
//-------------------------------------------------------------------------------------------------------------------
// Static
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackCommon.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackCommon.java
deleted file mode 100644
index af93858..0000000
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackCommon.java
+++ /dev/null
@@ -1,24 +0,0 @@
-//
***************************************************************************************************************************
-// * 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. *
-//
***************************************************************************************************************************
-package org.apache.juneau.msgpack;
-
-/**
- * Configurable properties common to both the {@link MsgPackSerializer} and
{@link MsgPackParser} classes.
- */
-public interface MsgPackCommon {
-
- /**
- * Property prefix.
- */
- static final String PREFIX = "MsgPack";
-}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java
index 7b081aa..bc76282 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java
@@ -28,7 +28,7 @@ import org.apache.juneau.parser.*;
* Handles <c>Content-Type</c> types: <bc>octal/msgpack</bc>
*/
@ConfigurableContext
-public class MsgPackParser extends InputStreamParser implements
MsgPackMetaProvider, MsgPackCommon {
+public class MsgPackParser extends InputStreamParser implements
MsgPackMetaProvider {
//-------------------------------------------------------------------------------------------------------------------
// Configurable properties
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
index 4fb5354..36c4006 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
@@ -31,7 +31,7 @@ import org.apache.juneau.serializer.*;
* Produces <c>Content-Type</c> types: <bc>octal/msgpack</bc>
*/
@ConfigurableContext
-public class MsgPackSerializer extends OutputStreamSerializer implements
MsgPackMetaProvider, MsgPackCommon {
+public class MsgPackSerializer extends OutputStreamSerializer implements
MsgPackMetaProvider {
//-------------------------------------------------------------------------------------------------------------------
// Configurable properties
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextCommon.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextCommon.java
deleted file mode 100644
index 974e0cc..0000000
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextCommon.java
+++ /dev/null
@@ -1,24 +0,0 @@
-//
***************************************************************************************************************************
-// * 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. *
-//
***************************************************************************************************************************
-package org.apache.juneau.plaintext;
-
-/**
- * Configurable properties common to both the {@link PlainTextSerializer} and
{@link PlainTextParser} classes.
- */
-public interface PlainTextCommon {
-
- /**
- * Property prefix.
- */
- static final String PREFIX = "PlainText";
-}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParser.java
index 5919235..271bf16 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParser.java
@@ -43,7 +43,7 @@ import org.apache.juneau.transform.*;
* defined on it.
*/
@ConfigurableContext
-public class PlainTextParser extends ReaderParser implements
PlainTextMetaProvider, PlainTextCommon {
+public class PlainTextParser extends ReaderParser implements
PlainTextMetaProvider {
//-------------------------------------------------------------------------------------------------------------------
// Configurable properties
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializer.java
index 0f7780e..f0c6f2a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializer.java
@@ -39,7 +39,7 @@ import org.apache.juneau.transform.*;
* transform defined on it.
*/
@ConfigurableContext
-public class PlainTextSerializer extends WriterSerializer implements
PlainTextMetaProvider, PlainTextCommon {
+public class PlainTextSerializer extends WriterSerializer implements
PlainTextMetaProvider {
//-------------------------------------------------------------------------------------------------------------------
// Configurable properties
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlCommon.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlCommon.java
deleted file mode 100644
index 3714b0d..0000000
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlCommon.java
+++ /dev/null
@@ -1,24 +0,0 @@
-//
***************************************************************************************************************************
-// * 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. *
-//
***************************************************************************************************************************
-package org.apache.juneau.soap;
-
-/**
- * Configurable properties common to the {@link SoapXmlSerializer} and future
parser classes.
- */
-public interface SoapXmlCommon {
-
- /**
- * Property prefix.
- */
- static final String PREFIX = "SoapXml";
-}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializer.java
index 7d4abff..f227e63 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializer.java
@@ -35,7 +35,7 @@ import org.apache.juneau.xml.*;
* Essentially the same output as {@link XmlDocSerializer}, except wrapped in
a standard SOAP envelope.
*/
@ConfigurableContext
-public final class SoapXmlSerializer extends XmlSerializer implements
SoapXmlMetaProvider,SoapXmlCommon {
+public final class SoapXmlSerializer extends XmlSerializer implements
SoapXmlMetaProvider {
//-------------------------------------------------------------------------------------------------------------------
// Configurable properties
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonCommon.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonCommon.java
deleted file mode 100644
index 432d79e..0000000
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonCommon.java
+++ /dev/null
@@ -1,24 +0,0 @@
-//
***************************************************************************************************************************
-// * 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. *
-//
***************************************************************************************************************************
-package org.apache.juneau.uon;
-
-/**
- * Configurable properties common to both the {@link UonSerializer} and {@link
UonParser} classes.
- */
-public interface UonCommon {
-
- /**
- * Property prefix.
- */
- static final String PREFIX = "Uon";
-}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParser.java
index 1572cfe..9d96d2e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParser.java
@@ -35,7 +35,7 @@ import org.apache.juneau.parser.*;
* This parser uses a state machine, which makes it very fast and efficient.
*/
@ConfigurableContext
-public class UonParser extends ReaderParser implements HttpPartParser,
UonMetaProvider, UonCommon {
+public class UonParser extends ReaderParser implements HttpPartParser,
UonMetaProvider {
//-------------------------------------------------------------------------------------------------------------------
// Configurable properties
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
index 9dd219e..d32df52 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
@@ -120,7 +120,7 @@ import org.apache.juneau.serializer.*;
* </p>
*/
@ConfigurableContext
-public class UonSerializer extends WriterSerializer implements
HttpPartSerializer, UonMetaProvider, UonCommon {
+public class UonSerializer extends WriterSerializer implements
HttpPartSerializer, UonMetaProvider {
//-------------------------------------------------------------------------------------------------------------------
// Configurable properties
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingCommon.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingCommon.java
deleted file mode 100644
index 35747c7..0000000
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingCommon.java
+++ /dev/null
@@ -1,24 +0,0 @@
-//
***************************************************************************************************************************
-// * 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. *
-//
***************************************************************************************************************************
-package org.apache.juneau.urlencoding;
-
-/**
- * Configurable properties common to both the {@link UrlEncodingSerializer}
and {@link UrlEncodingParser} classes.
- */
-public interface UrlEncodingCommon {
-
- /**
- * Property prefix.
- */
- static final String PREFIX = "UrlEncoding";
-}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java
index 4d63dd7..e9bb44b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java
@@ -40,7 +40,7 @@ import org.apache.juneau.uon.*;
* This parser uses a state machine, which makes it very fast and efficient.
*/
@ConfigurableContext
-public class UrlEncodingParser extends UonParser implements
UrlEncodingMetaProvider, UrlEncodingCommon {
+public class UrlEncodingParser extends UonParser implements
UrlEncodingMetaProvider {
//-------------------------------------------------------------------------------------------------------------------
// Configurable properties
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java
index dedbe1b..f75ccff 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java
@@ -117,7 +117,7 @@ import org.apache.juneau.uon.*;
* </p>
*/
@ConfigurableContext
-public class UrlEncodingSerializer extends UonSerializer implements
UrlEncodingMetaProvider, UrlEncodingCommon {
+public class UrlEncodingSerializer extends UonSerializer implements
UrlEncodingMetaProvider {
//-------------------------------------------------------------------------------------------------------------------
// Configurable properties
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlCommon.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlCommon.java
deleted file mode 100644
index c4dbdc7..0000000
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlCommon.java
+++ /dev/null
@@ -1,24 +0,0 @@
-//
***************************************************************************************************************************
-// * 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. *
-//
***************************************************************************************************************************
-package org.apache.juneau.xml;
-
-/**
- * Configurable properties common to both the {@link XmlSerializer} and {@link
XmlParser} classes.
- */
-public interface XmlCommon {
-
- /**
- * Property prefix.
- */
- static final String PREFIX = "Xml";
-}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParser.java
index 6d101e7..be262ab 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParser.java
@@ -36,7 +36,7 @@ import org.apache.juneau.parser.*;
* See the {@link XmlSerializer} class for a description of Juneau-generated
XML.
*/
@ConfigurableContext
-public class XmlParser extends ReaderParser implements XmlMetaProvider,
XmlCommon {
+public class XmlParser extends ReaderParser implements XmlMetaProvider {
//-------------------------------------------------------------------------------------------------------------------
// Configurable properties
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
index dff5cb9..69df583 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
@@ -116,7 +116,7 @@ import org.apache.juneau.serializer.*;
* </ul>
*/
@ConfigurableContext
-public class XmlSerializer extends WriterSerializer implements
XmlMetaProvider, XmlCommon {
+public class XmlSerializer extends WriterSerializer implements XmlMetaProvider
{
//-------------------------------------------------------------------------------------------------------------------
// Configurable properties
