Author: veithen
Date: Mon Sep 21 21:51:47 2015
New Revision: 1704433
URL: http://svn.apache.org/viewvc?rev=1704433&view=rev
Log:
Use static methods and utility classes where appropriate.
Added:
webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/IRIUtil.java
(with props)
Modified:
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCategories.java
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCollection.java
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMContent.java
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMElement.java
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMGenerator.java
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMIRI.java
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMLink.java
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMText.java
Added:
webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/IRIUtil.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/IRIUtil.java?rev=1704433&view=auto
==============================================================================
---
webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/IRIUtil.java
(added)
+++
webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/IRIUtil.java
Mon Sep 21 21:51:47 2015
@@ -0,0 +1,37 @@
+/*
+ * 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.axiom.fom;
+
+import org.apache.abdera.i18n.iri.IRI;
+
+public final class IRIUtil {
+ private IRIUtil() {}
+
+ public static IRI getUriValue(String v) {
+ return (v != null) ? new IRI(v) : null;
+ }
+
+ public static String getStringValue(IRI uri) {
+ return (uri != null) ? uri.toString() : null;
+ }
+
+ public static IRI resolve(IRI base, IRI value) {
+ return base != null ? base.resolve(value) : value;
+ }
+}
Propchange:
webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/IRIUtil.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCategories.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCategories.java?rev=1704433&r1=1704432&r2=1704433&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCategories.java
(original)
+++
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCategories.java
Mon Sep 21 21:51:47 2015
@@ -25,6 +25,7 @@ import org.apache.abdera.model.Categorie
import org.apache.abdera.model.Category;
import org.apache.abdera.parser.stax.util.FOMHelper;
import org.apache.axiom.fom.AbderaCategories;
+import org.apache.axiom.fom.IRIUtil;
import org.apache.axiom.om.OMElement;
public class FOMCategories extends FOMExtensibleElement implements
AbderaCategories {
@@ -103,11 +104,11 @@ public class FOMCategories extends FOMEx
}
public IRI getHref() {
- return _getUriValue(getAttributeValue(HREF));
+ return IRIUtil.getUriValue(getAttributeValue(HREF));
}
public IRI getResolvedHref() {
- return _resolve(getResolvedBaseUri(), getHref());
+ return IRIUtil.resolve(getResolvedBaseUri(), getHref());
}
public Categories setHref(String href) {
Modified:
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCollection.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCollection.java?rev=1704433&r1=1704432&r2=1704433&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCollection.java
(original)
+++
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCollection.java
Mon Sep 21 21:51:47 2015
@@ -31,6 +31,7 @@ import org.apache.abdera.model.Element;
import org.apache.abdera.model.Text;
import org.apache.abdera.util.MimeTypeHelper;
import org.apache.axiom.fom.AbderaCollection;
+import org.apache.axiom.fom.IRIUtil;
import org.apache.axiom.om.OMElement;
@SuppressWarnings("deprecation")
@@ -68,11 +69,11 @@ public class FOMCollection extends FOMEx
}
public IRI getHref() {
- return _getUriValue(getAttributeValue(HREF));
+ return IRIUtil.getUriValue(getAttributeValue(HREF));
}
public IRI getResolvedHref() {
- return _resolve(getResolvedBaseUri(), getHref());
+ return IRIUtil.resolve(getResolvedBaseUri(), getHref());
}
public Collection setHref(String href) {
Modified:
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMContent.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMContent.java?rev=1704433&r1=1704432&r2=1704433&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMContent.java
(original)
+++
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMContent.java
Mon Sep 21 21:51:47 2015
@@ -30,6 +30,7 @@ import org.apache.abdera.model.ElementWr
import org.apache.abdera.util.Constants;
import org.apache.axiom.attachments.ByteArrayDataSource;
import org.apache.axiom.fom.AbderaContent;
+import org.apache.axiom.fom.IRIUtil;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.util.base64.Base64Utils;
@@ -118,11 +119,11 @@ public class FOMContent extends FOMExten
}
public IRI getSrc() {
- return _getUriValue(getAttributeValue(SRC));
+ return IRIUtil.getUriValue(getAttributeValue(SRC));
}
public IRI getResolvedSrc() {
- return _resolve(getResolvedBaseUri(), getSrc());
+ return IRIUtil.resolve(getResolvedBaseUri(), getSrc());
}
public Content setSrc(String src) {
@@ -293,7 +294,7 @@ public class FOMContent extends FOMExten
if (getAttributeValue(BASE) != null)
return
super.getBaseUri().resolve(el.getAttributeValue(BASE));
else
- return _getUriValue(el.getAttributeValue(BASE));
+ return IRIUtil.getUriValue(el.getAttributeValue(BASE));
}
}
}
Modified:
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMElement.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMElement.java?rev=1704433&r1=1704432&r2=1704433&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMElement.java
(original)
+++
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMElement.java
Mon Sep 21 21:51:47 2015
@@ -58,6 +58,7 @@ import org.apache.abdera.util.MimeTypeHe
import org.apache.abdera.writer.Writer;
import org.apache.abdera.writer.WriterOptions;
import org.apache.axiom.fom.AbderaElement;
+import org.apache.axiom.fom.IRIUtil;
import org.apache.axiom.fom.Policies;
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMComment;
@@ -155,7 +156,7 @@ public class FOMElement extends FOMChild
}
public IRI getBaseUri() {
- IRI uri = _getUriValue(getAttributeValue(BASE));
+ IRI uri = IRIUtil.getUriValue(getAttributeValue(BASE));
if (IRIHelper.isJavascriptUri(uri) || IRIHelper.isMailtoUri(uri)) {
uri = null;
}
@@ -172,7 +173,7 @@ public class FOMElement extends FOMChild
public IRI getResolvedBaseUri() {
IRI baseUri = null;
- IRI uri = _getUriValue(getAttributeValue(BASE));
+ IRI uri = IRIUtil.getUriValue(getAttributeValue(BASE));
if (IRIHelper.isJavascriptUri(uri) || IRIHelper.isMailtoUri(uri)) {
uri = null;
}
@@ -190,7 +191,7 @@ public class FOMElement extends FOMChild
}
public <T extends Element> T setBaseUri(IRI base) {
- setAttributeValue(BASE, _getStringValue(base));
+ setAttributeValue(BASE, IRIUtil.getStringValue(base));
return (T)this;
}
@@ -231,18 +232,6 @@ public class FOMElement extends FOMChild
}
}
- protected IRI _getUriValue(String v) {
- return (v != null) ? new IRI(v) : null;
- }
-
- protected String _getStringValue(IRI uri) {
- return (uri != null) ? uri.toString() : null;
- }
-
- protected IRI _resolve(IRI base, IRI value) {
- return base != null ? base.resolve(value) : value;
- }
-
public void writeTo(OutputStream out, WriterOptions options) throws
IOException {
Writer writer = this.getFactory().getAbdera().getWriter();
writer.writeTo(this, out, options);
Modified:
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMGenerator.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMGenerator.java?rev=1704433&r1=1704432&r2=1704433&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMGenerator.java
(original)
+++
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMGenerator.java
Mon Sep 21 21:51:47 2015
@@ -20,15 +20,15 @@ package org.apache.abdera.parser.stax;
import org.apache.abdera.i18n.iri.IRI;
import org.apache.abdera.model.Generator;
import org.apache.axiom.fom.AbderaGenerator;
+import org.apache.axiom.fom.IRIUtil;
public class FOMGenerator extends FOMElement implements AbderaGenerator {
public IRI getUri() {
- String value = getAttributeValue(AURI);
- return (value != null) ? new IRI(value) : null;
+ return IRIUtil.getUriValue(getAttributeValue(AURI));
}
public IRI getResolvedUri() {
- return _resolve(getResolvedBaseUri(), getUri());
+ return IRIUtil.resolve(getResolvedBaseUri(), getUri());
}
public Generator setUri(String uri) {
Modified:
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMIRI.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMIRI.java?rev=1704433&r1=1704432&r2=1704433&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMIRI.java
(original)
+++
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMIRI.java
Mon Sep 21 21:51:47 2015
@@ -21,10 +21,11 @@ import org.apache.abdera.i18n.iri.IRI;
import org.apache.abdera.model.Element;
import org.apache.abdera.model.IRIElement;
import org.apache.axiom.fom.AbderaIRIElement;
+import org.apache.axiom.fom.IRIUtil;
public class FOMIRI extends FOMElement implements AbderaIRIElement {
public IRI getValue() {
- return _getUriValue(getText());
+ return IRIUtil.getUriValue(getText());
}
public IRIElement setValue(String iri) {
@@ -36,7 +37,7 @@ public class FOMIRI extends FOMElement i
}
public IRI getResolvedValue() {
- return _resolve(getResolvedBaseUri(), getValue());
+ return IRIUtil.resolve(getResolvedBaseUri(), getValue());
}
public IRIElement setNormalizedValue(String uri) {
Modified:
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMLink.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMLink.java?rev=1704433&r1=1704432&r2=1704433&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMLink.java
(original)
+++
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMLink.java
Mon Sep 21 21:51:47 2015
@@ -23,14 +23,15 @@ import org.apache.abdera.i18n.iri.IRI;
import org.apache.abdera.model.Element;
import org.apache.abdera.model.Link;
import org.apache.axiom.fom.AbderaLink;
+import org.apache.axiom.fom.IRIUtil;
public class FOMLink extends FOMExtensibleElement implements AbderaLink {
public IRI getHref() {
- return _getUriValue(getAttributeValue(HREF));
+ return IRIUtil.getUriValue(getAttributeValue(HREF));
}
public IRI getResolvedHref() {
- return _resolve(getResolvedBaseUri(), getHref());
+ return IRIUtil.resolve(getResolvedBaseUri(), getHref());
}
public Link setHref(String href) {
Modified:
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMText.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMText.java?rev=1704433&r1=1704432&r2=1704433&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMText.java
(original)
+++
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMText.java
Mon Sep 21 21:51:47 2015
@@ -23,6 +23,7 @@ import org.apache.abdera.model.Element;
import org.apache.abdera.model.Text;
import org.apache.abdera.util.Constants;
import org.apache.axiom.fom.AbderaText;
+import org.apache.axiom.fom.IRIUtil;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNode;
@@ -155,7 +156,7 @@ public class FOMText extends FOMElement
if (getAttributeValue(BASE) != null)
return
super.getBaseUri().resolve(el.getAttributeValue(BASE));
else
- return _getUriValue(el.getAttributeValue(BASE));
+ return IRIUtil.getUriValue(el.getAttributeValue(BASE));
}
}
}
