Unused code cleanup

18 files changed, 2 insertions, 836 deletions

diff --git a/src/main/java/com/cliqset/xrd/Alias.java b/src/main/java/com/cliqset/xrd/Alias.java
deleted file mode 100644
index 3a108f46..00000000
--- a/src/main/java/com/cliqset/xrd/Alias.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-	Copyright 2010 Cliqset Inc.
-	
-	Licensed 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 com.cliqset.xrd;
-
-import java.net.URI;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlAnyAttribute;
-import jakarta.xml.bind.annotation.XmlType;
-import jakarta.xml.bind.annotation.XmlValue;
-
-@XmlType(name="Alias", namespace=XRDConstants.XRD_NAMESPACE)
-@XmlAccessorType(XmlAccessType.FIELD)
-public class Alias {
-
-	@XmlAnyAttribute()
-	private Map<QName, Object> unknownAttributes;
-	
-	@XmlValue
-	private URI value;
-
-	public void setValue(URI value) {
-		this.value = value;
-	}
-
-	public URI getValue() {
-		return value;
-	}
-
-	public void setUnknownAttributes(Map<QName, Object> unknownAttributes) {
-		this.unknownAttributes = unknownAttributes;
-	}
-
-	public Map<QName, Object> getUnknownAttributes() {
-		if (null == this.unknownAttributes) {
-			this.unknownAttributes = new HashMap<QName, Object>();
-		}
-		return unknownAttributes;
-	}
-	
-	public boolean hasUnknownAttributes() {
-		return !(null == this.unknownAttributes || this.unknownAttributes.size() < 1);
-	}
-}
diff --git a/src/main/java/com/cliqset/xrd/Expires.java b/src/main/java/com/cliqset/xrd/Expires.java
deleted file mode 100644
index bb6704f8..00000000
--- a/src/main/java/com/cliqset/xrd/Expires.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-	Copyright 2010 Cliqset Inc.
-	
-	Licensed 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 com.cliqset.xrd;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-import jakarta.xml.bind.annotation.*;
-
-@XmlType(name="Expires", namespace=XRDConstants.XRD_NAMESPACE)
-@XmlAccessorType(XmlAccessType.FIELD)
-public class Expires {
-
-	@XmlAnyAttribute
-	private Map<QName, Object> unknownAttributes;
-	
-	@XmlValue
-	private Date value;
-
-	public void setValue(Date value) {
-		this.value = value;
-	}
-
-	public Date getValue() {
-		return value;
-	}
-
-	public void setUnknownAttributes(Map<QName, Object> unknownAttributes) {
-		this.unknownAttributes = unknownAttributes;
-	}
-
-	public Map<QName, Object> getUnknownAttributes() {
-		if (null == this.unknownAttributes) {
-			this.unknownAttributes = new HashMap<QName, Object>();
-		}
-		return unknownAttributes;
-	}
-	
-	public boolean hasUnknownAttributes() {
-		return !(null == this.unknownAttributes || this.unknownAttributes.size() < 1);
-	}
-}
diff --git a/src/main/java/com/cliqset/xrd/Link.java b/src/main/java/com/cliqset/xrd/Link.java
deleted file mode 100644
index 020defe6..00000000
--- a/src/main/java/com/cliqset/xrd/Link.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
-	Copyright 2010 Cliqset Inc.
-	
-	Licensed 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 com.cliqset.xrd;
-
-import java.net.URI;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-import jakarta.xml.bind.annotation.XmlAnyElement;
-import jakarta.xml.bind.annotation.XmlAnyAttribute;
-import jakarta.xml.bind.annotation.XmlType;
-import jakarta.xml.bind.annotation.XmlAttribute;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-
-import org.w3c.dom.Element;
-
-@XmlType(name="Link", namespace=XRDConstants.XRD_NAMESPACE)
-@XmlAccessorType(XmlAccessType.FIELD)
-public class Link {
-	
-	@XmlAttribute(name="rel")
-	private URI rel;
-	
-	@XmlAttribute(name="type")
-	private String type;
-	
-	@XmlAttribute(name="href")
-	private URI href;
-	
-	@XmlAttribute(name="template")
-	private String template;
-
-	@XmlElement(name="Title")
-	private List<Title> titles;
-	
-	@XmlElement(name="Property")
-	private List<Property> properties;
-	
-	@XmlAnyElement
-	private List<Element> unknownElements;
-	
-	@XmlAnyAttribute
-	private Map<QName,Object> unknownAttributes;
-
-	private URI processedTemplate;
-	
-	public void setRel(URI rel) {
-		this.rel = rel;
-	}
-
-	public URI getRel() {
-		return rel;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	public String getType() {
-		return type;
-	}
-
-	public void setHref(URI href) {
-		this.href = href;
-	}
-
-	public URI getHref() {
-		return href;
-	}
-
-	public void setTemplate(String template) {
-		this.template = template;
-	}
-
-	public String getTemplate() {
-		return template;
-	}
-
-	public void setTitles(List<Title> titles) {
-		this.titles = titles;
-	}
-
-	public List<Title> getTitles() {
-		return titles;
-	}
-
-	public void setProperties(List<Property> properties) {
-		this.properties = properties;
-	}
-
-	public List<Property> getProperties() {
-		return properties;
-	}
-
-	public void setUnknownElements(List<Element> unknownElements) {
-		this.unknownElements = unknownElements;
-	}
-
-	public List<Element> getUnknownElements() {
-		return unknownElements;
-	}
-
-	public void setUnknownAttributes(Map<QName,Object> unknownAttributes) {
-		this.unknownAttributes = unknownAttributes;
-	}
-
-	public Map<QName,Object> getUnknownAttributes() {
-		if (null == this.unknownAttributes) {
-			this.unknownAttributes = new HashMap<QName, Object>();
-		}
-		return unknownAttributes;
-	}
-
-	public boolean hasTemplate() {
-		return null != this.template;
-	}
-	
-	public boolean hasHref() {
-		return null != this.href;
-	}
-	
-	public boolean hasUnknownAttributes() {
-		return !(null == this.unknownAttributes || this.unknownAttributes.size() < 1);
-	}
-
-	public void setProcessedTemplate(URI processedTemplate) {
-		this.processedTemplate = processedTemplate;
-	}
-
-	public URI getProcessedTemplate() {
-		return processedTemplate;
-	}
-}
diff --git a/src/main/java/com/cliqset/xrd/Property.java b/src/main/java/com/cliqset/xrd/Property.java
deleted file mode 100644
index f7777c94..00000000
--- a/src/main/java/com/cliqset/xrd/Property.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-	Copyright 2010 Cliqset Inc.
-	
-	Licensed 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 com.cliqset.xrd;
-
-import java.net.URI;
-
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlAnyAttribute;
-import jakarta.xml.bind.annotation.XmlAttribute;
-import jakarta.xml.bind.annotation.XmlType;
-import jakarta.xml.bind.annotation.XmlValue;
-import javax.xml.namespace.QName;
-
-import java.util.HashMap;
-import java.util.Map;
-
-@XmlType(name="Property", namespace=XRDConstants.XRD_NAMESPACE)
-@XmlAccessorType(XmlAccessType.FIELD)
-public class Property {
-
-	@XmlAttribute(name="type", required=true)
-	private URI type;
-
-	@XmlAnyAttribute()
-	private Map<QName, Object> unknownAttributes;
-	
-	@XmlValue()
-	private URI value;
-
-	public void setType(URI type) {
-		this.type = type;
-	}
-
-	public URI getType() {
-		return type;
-	}
-	
-	public void setValue(URI value) {
-		this.value = value;
-	}
-
-	public URI getValue() {
-		return value;
-	}
-
-	public void setUnknownAttributes(Map<QName, Object> unknownAttributes) {
-		this.unknownAttributes = unknownAttributes;
-	}
-
-	public Map<QName, Object> getUnknownAttributes() {
-		if (null == this.unknownAttributes) {
-			this.unknownAttributes = new HashMap<QName, Object>();
-		}
-		return unknownAttributes;
-	}
-	
-	public boolean hasUnknownAttributes() {
-		return !(null == this.unknownAttributes || this.unknownAttributes.size() < 1);
-	}
-}
diff --git a/src/main/java/com/cliqset/xrd/Signature.java b/src/main/java/com/cliqset/xrd/Signature.java
deleted file mode 100644
index f52f9218..00000000
--- a/src/main/java/com/cliqset/xrd/Signature.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-	Copyright 2010 Cliqset Inc.
-	
-	Licensed 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 com.cliqset.xrd;
-
-public class Signature {
-
-}
diff --git a/src/main/java/com/cliqset/xrd/Subject.java b/src/main/java/com/cliqset/xrd/Subject.java
deleted file mode 100644
index d2f6b333..00000000
--- a/src/main/java/com/cliqset/xrd/Subject.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-	Copyright 2010 Cliqset Inc.
-	
-	Licensed 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 com.cliqset.xrd;
-
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlAnyAttribute;
-import jakarta.xml.bind.annotation.XmlType;
-import jakarta.xml.bind.annotation.XmlValue;
-import javax.xml.namespace.QName;
-
-import java.net.URI;
-import java.util.HashMap;
-import java.util.Map;
-
-@XmlType(name="Subject", namespace=XRDConstants.XRD_NAMESPACE)
-@XmlAccessorType(XmlAccessType.FIELD)
-public class Subject {
-
-	@XmlAnyAttribute()
-	private Map<QName, Object> unknownAttributes;
-	
-	@XmlValue
-	private URI value;
-
-	public void setValue(URI value) {
-		this.value = value;
-	}
-
-	public URI getValue() {
-		return value;
-	}
-
-	public void setUnknownAttributes(Map<QName, Object> unknownAttributes) {
-		this.unknownAttributes = unknownAttributes;
-	}
-
-	public Map<QName, Object> getUnknownAttributes() {
-		if (null == this.unknownAttributes) {
-			this.unknownAttributes = new HashMap<QName, Object>();
-		}
-		return unknownAttributes;
-	}
-	
-	public boolean hasUnknownAttributes() {
-		return !(null == this.unknownAttributes || this.unknownAttributes.size() < 1);
-	}
-}
diff --git a/src/main/java/com/cliqset/xrd/Title.java b/src/main/java/com/cliqset/xrd/Title.java
deleted file mode 100644
index 4bb43c55..00000000
--- a/src/main/java/com/cliqset/xrd/Title.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-	Copyright 2010 Cliqset Inc.
-	
-	Licensed 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 com.cliqset.xrd;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import jakarta.xml.bind.annotation.*; 
-import javax.xml.namespace.QName;
-
-@XmlType(name="Title", namespace=XRDConstants.XRD_NAMESPACE)
-@XmlAccessorType(XmlAccessType.FIELD)
-public class Title {
-
-	@XmlAttribute(name="lang", namespace=XRDConstants.XML_NAMESPACE)
-	private String lang;
-	
-	@XmlAnyAttribute()
-	private Map<QName, Object> unknownAttributes;
-	
-	@XmlValue
-	private String value;
-
-	public void setValue(String value) {
-		this.value = value;
-	}
-
-	public String getValue() {
-		return value;
-	}
-
-	public void setLang(String lang) {
-		this.lang = lang;
-	}
-
-	public String getLang() {
-		return lang;
-	}
-
-	public void setUnknownAttributes(Map<QName, Object> unknownAttributes) {
-		this.unknownAttributes = unknownAttributes;
-	}
-
-	public Map<QName, Object> getUnknownAttributes() {
-		if (null == this.unknownAttributes) {
-			this.unknownAttributes = new HashMap<QName, Object>();
-		}
-		return unknownAttributes;
-	}
-	
-	public boolean hasUnknownAttributes() {
-		return !(null == this.unknownAttributes || this.unknownAttributes.size() < 1);
-	}
-}
diff --git a/src/main/java/com/cliqset/xrd/XRD.java b/src/main/java/com/cliqset/xrd/XRD.java
deleted file mode 100644
index 8fc6f7de..00000000
--- a/src/main/java/com/cliqset/xrd/XRD.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
-	Copyright 2010 Cliqset Inc.
-	
-	Licensed 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 com.cliqset.xrd;
-
-import javax.xml.namespace.QName;
-import jakarta.xml.bind.annotation.*;
-import jakarta.xml.bind.JAXBContext;
-import jakarta.xml.bind.JAXBException;
-
-import org.w3c.dom.Element;
-
-import java.io.InputStream;
-import java.util.List;
-import java.util.Map;
-
-@XmlRootElement(name="XRD", namespace=XRDConstants.XRD_NAMESPACE)
-@XmlAccessorType(XmlAccessType.FIELD)
-public class XRD {
-
-	@XmlAttribute(name="id", namespace=XRDConstants.XML_NAMESPACE)
-	private String id;
-	
-	@XmlAnyAttribute
-	private Map<QName, Object> unknownAttributes;
-	
-	@XmlElement(name="Expires", namespace=XRDConstants.XRD_NAMESPACE)
-	private Expires expires;
-	
-	@XmlElement(name="Subject", namespace=XRDConstants.XRD_NAMESPACE)
-	private Subject subject;
-	
-	@XmlElement(name="Alias", namespace=XRDConstants.XRD_NAMESPACE)
-	private List<Alias> aliases;
-	
-	@XmlElement(name="Property", namespace=XRDConstants.XRD_NAMESPACE)
-	private List<Property> properties;
-	
-	@XmlElement(name="Link", namespace=XRDConstants.XRD_NAMESPACE)
-	private List<Link> links;
-	
-	@XmlElement(name="Signature", namespace=XRDConstants.XML_SIG_NAMESPACE)
-	private List<Signature> signatures;
-
-	@XmlAnyElement
-	private List<Element> unknownElements;
-	
-	public void setExpires(Expires expires) {
-		this.expires = expires;
-	}
-
-	public Expires getExpires() {
-		return expires;
-	}
-
-	public void setSubject(Subject subject) {
-		this.subject = subject;
-	}
-
-	public Subject getSubject() {
-		return subject;
-	}
-
-	public void setAliases(List<Alias> aliases) {
-		this.aliases = aliases;
-	}
-
-	public List<Alias> getAliases() {
-		return aliases;
-	}
-
-	public void setProperties(List<Property> properties) {
-		this.properties = properties;
-	}
-
-	public List<Property> getProperties() {
-		return properties;
-	}
-
-	public void setLinks(List<Link> links) {
-		this.links = links;
-	}
-
-	public List<Link> getLinks() {
-		return links;
-	}
-
-	public void setSignatures(List<Signature> signatures) {
-		this.signatures = signatures;
-	}
-
-	public List<Signature> getSignatures() {
-		return signatures;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public String getId() {
-		return id;
-	}
-
-	public void setUnknownAttributes(Map<QName, Object> unknownAttributes) {
-		this.unknownAttributes = unknownAttributes;
-	}
-
-	public Map<QName, Object> getUnknownAttributes() {
-		return unknownAttributes;
-	}
-
-	public void setUnknownElements(List<Element> unknownElements) {
-		this.unknownElements = unknownElements;
-	}
-
-	public List<Element> getUnknownElements() {
-		return unknownElements;
-	}
-	
-	public boolean hasId() {
-		return null != this.id;
-	}
-	
-	public boolean hasExpires() {
-		return null != this.expires;
-	}
-	
-	public boolean hasSubject() {
-		return null != this.subject;
-	}
-	
-	public boolean hasAliases() {
-		return null != this.aliases;
-	}
-	
-	public boolean hasProperties() {
-		return null != this.properties;
-	}
-	
-	public boolean hasLinks() {
-		return null != this.links;
-	}
-	
-	public static XRD fromStream(InputStream stream) throws XRDException {
-		JAXBContext context;
-		try {
-			context = JAXBContext.newInstance(XRD.class);
-			return (XRD)context.createUnmarshaller().unmarshal(stream);
-		} catch (JAXBException e) {
-			throw new XRDException("Unable to deserialize stream into XRD", e);
-		}
-	}
-}
diff --git a/src/main/java/com/cliqset/xrd/XRDConstants.java b/src/main/java/com/cliqset/xrd/XRDConstants.java
deleted file mode 100644
index 39e3c584..00000000
--- a/src/main/java/com/cliqset/xrd/XRDConstants.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-	Copyright 2010 Cliqset Inc.
-	
-	Licensed 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 com.cliqset.xrd;
-
-public class XRDConstants {
-
-	public static final String XRD_NAMESPACE = "http://docs.oasis-open.org/ns/xri/xrd-1.0";
-	public static final String XML_SIG_NAMESPACE = "";
-	public static final String XML_NAMESPACE = "";
-	
-	public static final String XRD_MEDIA_TYPE = "application/xrd+xml";
-}
diff --git a/src/main/java/com/cliqset/xrd/XRDException.java b/src/main/java/com/cliqset/xrd/XRDException.java
deleted file mode 100644
index da1e6849..00000000
--- a/src/main/java/com/cliqset/xrd/XRDException.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-	Copyright 2010 Cliqset Inc.
-	
-	Licensed 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 com.cliqset.xrd;
-
-@SuppressWarnings("serial")
-public class XRDException extends Exception {
-
-	public XRDException() {}
-	
-	public XRDException(String message) {
-		super(message);
-	}
-	
-	public XRDException(Throwable cause) {
-		super(cause);
-	}
-	
-	public XRDException(String message, Throwable cause) {
-		super(message, cause);
-	}
-}
diff --git a/src/main/java/com/cliqset/xrd/package-info.java b/src/main/java/com/cliqset/xrd/package-info.java
deleted file mode 100644
index dfc11f51..00000000
--- a/src/main/java/com/cliqset/xrd/package-info.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2008-2017, Juick
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-@XmlSchema(
-        namespace=XRD_NAMESPACE,
-        elementFormDefault = XmlNsForm.QUALIFIED,
-        xmlns={
-                @XmlNs(prefix= StringUtils.EMPTY, namespaceURI=XRD_NAMESPACE)
-        }
-)
-package com.cliqset.xrd;
-
-import org.apache.commons.lang3.StringUtils;
-
-import jakarta.xml.bind.annotation.XmlNs;
-import jakarta.xml.bind.annotation.XmlNsForm;
-import jakarta.xml.bind.annotation.XmlSchema;
-
-import static com.cliqset.xrd.XRDConstants.XRD_NAMESPACE;
\ No newline at end of file
diff --git a/src/main/java/com/juick/EmailManager.java b/src/main/java/com/juick/EmailManager.java
index df02fe1c..37c8e3c5 100644
--- a/src/main/java/com/juick/EmailManager.java
+++ b/src/main/java/com/juick/EmailManager.java
@@ -33,7 +33,6 @@ import jakarta.mail.internet.MimeMessage;
 import jakarta.mail.internet.MimeMultipart;
 
 import com.juick.util.HttpBadRequestException;
-import com.juick.www.WebApp;
 import com.juick.service.EmailService;
 import com.juick.service.MessagesService;
 import com.juick.service.UserService;
@@ -67,8 +66,6 @@ public class EmailManager implements NotificationListener {
     private UserService userService;
     @Inject
     private ObjectMapper jsonMapper;
-    @Inject
-    private WebApp webApp;
     @Value("${web_domain:localhost}")
     private String webDomain;
     @Value("${service_email:}")
diff --git a/src/main/java/com/juick/config/HttpClientConfig.java b/src/main/java/com/juick/config/HttpClientConfig.java
index 9f5182e8..fd94ae4f 100644
--- a/src/main/java/com/juick/config/HttpClientConfig.java
+++ b/src/main/java/com/juick/config/HttpClientConfig.java
@@ -18,7 +18,6 @@
 package com.juick.config;
 
 import com.juick.util.ActivityPubRequestInterceptor;
-import okhttp3.Dispatcher;
 import okhttp3.OkHttpClient;
 import okhttp3.logging.HttpLoggingInterceptor;
 import org.slf4j.Logger;
diff --git a/src/main/java/com/juick/service/MessagesServiceImpl.java b/src/main/java/com/juick/service/MessagesServiceImpl.java
index bad080a0..de342977 100644
--- a/src/main/java/com/juick/service/MessagesServiceImpl.java
+++ b/src/main/java/com/juick/service/MessagesServiceImpl.java
@@ -38,8 +38,6 @@ import org.springframework.jdbc.core.ConnectionCallback;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
 import org.springframework.jdbc.core.namedparam.SqlParameterSource;
-import org.springframework.jdbc.core.simple.SimpleJdbcInsert;
-import org.springframework.jdbc.support.GeneratedKeyHolder;
 import org.springframework.lang.NonNull;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/src/main/java/com/juick/service/TagServiceImpl.java b/src/main/java/com/juick/service/TagServiceImpl.java
index 9f5c9356..1eea6812 100644
--- a/src/main/java/com/juick/service/TagServiceImpl.java
+++ b/src/main/java/com/juick/service/TagServiceImpl.java
@@ -27,15 +27,12 @@ import org.springframework.jdbc.core.BatchPreparedStatementSetter;
 import org.springframework.jdbc.core.PreparedStatementCallback;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
-import org.springframework.jdbc.support.GeneratedKeyHolder;
-import org.springframework.jdbc.support.KeyHolder;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Statement;
 import java.time.Instant;
 import java.time.ZoneOffset;
 import java.time.temporal.ChronoUnit;
diff --git a/src/main/java/com/juick/util/xmpp/JidConverter.java b/src/main/java/com/juick/util/xmpp/JidConverter.java
index 4f457164..5c40d470 100644
--- a/src/main/java/com/juick/util/xmpp/JidConverter.java
+++ b/src/main/java/com/juick/util/xmpp/JidConverter.java
@@ -18,13 +18,14 @@
 package com.juick.util.xmpp;
 
 import org.springframework.core.convert.converter.Converter;
+import org.springframework.lang.NonNull;
 import org.springframework.lang.Nullable;
 import rocks.xmpp.addr.Jid;
 
 public class JidConverter implements Converter<String, Jid> {
     @Nullable
     @Override
-    public Jid convert(String jidStr) {
+    public Jid convert(@NonNull String jidStr) {
         return Jid.of(jidStr);
     }
 }
diff --git a/src/main/java/com/juick/www/api/hostmeta/HostMeta.java b/src/main/java/com/juick/www/api/hostmeta/HostMeta.java
deleted file mode 100644
index c6f1dce6..00000000
--- a/src/main/java/com/juick/www/api/hostmeta/HostMeta.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2008-2020, Juick
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.juick.www.api.hostmeta;
-
-import com.cliqset.xrd.Link;
-import com.cliqset.xrd.XRD;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Collections;
-
-import static com.cliqset.xrd.XRDConstants.XRD_MEDIA_TYPE;
-
-@RestController
-public class HostMeta {
-    @Value("${ap_base_uri:http://localhost:8080/}")
-    private String baseUri;
-    @GetMapping(value = "/.well-known/host-meta", produces = { XRD_MEDIA_TYPE, MediaType.APPLICATION_XML_VALUE })
-    public XRD hostMetaResponse() {
-        Link webfinger = new Link();
-        webfinger.setTemplate(String.format("%swebfinger?resource={uri}", baseUri));
-        XRD xrd = new XRD();
-        xrd.setLinks(Collections.singletonList(webfinger));
-        return xrd;
-    }
-}
diff --git a/src/main/java/com/juick/www/api/xnodeinfo2/Info.java b/src/main/java/com/juick/www/api/xnodeinfo2/Info.java
index fc27dc66..adbd5712 100644
--- a/src/main/java/com/juick/www/api/xnodeinfo2/Info.java
+++ b/src/main/java/com/juick/www/api/xnodeinfo2/Info.java
@@ -17,27 +17,14 @@
 
 package com.juick.www.api.xnodeinfo2;
 
-import com.cliqset.xrd.Link;
-import com.cliqset.xrd.XRD;
 import com.fasterxml.jackson.annotation.JsonView;
 import com.juick.service.InfoService;
 import com.juick.www.api.xnodeinfo2.model.*;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.http.MediaType;
-import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.util.UriComponentsBuilder;
-
 import jakarta.inject.Inject;
-import java.net.URI;
-import java.time.ZonedDateTime;
-import java.time.temporal.ChronoUnit;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
 
 @RestController
 public class Info {
@@ -53,18 +40,6 @@ public class Info {
         return infoService.getCurrentNodeInfo("1.0");
     }
 
-    @GetMapping(value = "/.well-known/nodeinfo", produces = MediaType.APPLICATION_JSON_VALUE)
-    public XRD getNodeInfoLinks() {
-        Link nodeinfo = new Link();
-        nodeinfo.setRel(URI.create("http://nodeinfo.diaspora.software/ns/schema/2.0"));
-        UriComponentsBuilder uriComponentsBuilder = UriComponentsBuilder.fromUriString(baseUri);
-        uriComponentsBuilder.replacePath("/api/nodeinfo/2.0");
-        nodeinfo.setHref(uriComponentsBuilder.build().toUri());
-        XRD xrd = new XRD();
-        xrd.setLinks(Collections.singletonList(nodeinfo));
-        return xrd;
-    }
-
     @GetMapping(value = "/api/nodeinfo/2.0", produces = MediaType.APPLICATION_JSON_VALUE)
     @JsonView(NodeInfo.NodeInfoView.class)
     public NodeInfo showNodeInfo() {