You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by aj...@apache.org on 2018/03/09 15:27:39 UTC
[1/2] jena git commit: add @Override annotations
Repository: jena
Updated Branches:
refs/heads/master 46e2f5685 -> b8b482eca
add @Override annotations
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/b8b482ec
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/b8b482ec
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/b8b482ec
Branch: refs/heads/master
Commit: b8b482ecaa4f9ac72ef16a8f243186246d68ff10
Parents: 036ebce
Author: jaco0646 <ja...@hotmail.com>
Authored: Mon Mar 5 17:18:45 2018 -0600
Committer: ajs6f <aj...@apache.org>
Committed: Fri Mar 9 10:27:12 2018 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/jena/rdf/model/Model.java | 12 ++++++------
.../org/apache/jena/permissions/model/SecuredModel.java | 10 +++++-----
2 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/b8b482ec/jena-core/src/main/java/org/apache/jena/rdf/model/Model.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/Model.java b/jena-core/src/main/java/org/apache/jena/rdf/model/Model.java
index a7ef625..924256d 100644
--- a/jena-core/src/main/java/org/apache/jena/rdf/model/Model.java
+++ b/jena-core/src/main/java/org/apache/jena/rdf/model/Model.java
@@ -1053,10 +1053,10 @@ public interface Model
public boolean isClosed();
// Override return type for methods inherited from PrefixMapping
- Model setNsPrefix( String prefix, String uri );
- Model removeNsPrefix( String prefix );
- Model clearNsPrefixMap();
- Model setNsPrefixes( PrefixMapping other );
- Model setNsPrefixes( Map<String, String> map );
- Model withDefaultMappings( PrefixMapping map );
+ @Override Model setNsPrefix( String prefix, String uri );
+ @Override Model removeNsPrefix( String prefix );
+ @Override Model clearNsPrefixMap();
+ @Override Model setNsPrefixes( PrefixMapping other );
+ @Override Model setNsPrefixes( Map<String, String> map );
+ @Override Model withDefaultMappings( PrefixMapping map );
}
http://git-wip-us.apache.org/repos/asf/jena/blob/b8b482ec/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredModel.java
----------------------------------------------------------------------
diff --git a/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredModel.java b/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredModel.java
index ba96073..43d1685 100644
--- a/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredModel.java
+++ b/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredModel.java
@@ -1894,9 +1894,9 @@ public interface SecuredModel extends Model, SecuredPrefixMapping {
throws ReadDeniedException, AuthenticationRequiredException;
// Override return type for methods inherited from PrefixMapping
- SecuredModel setNsPrefix( String prefix, String uri );
- SecuredModel clearNsPrefixMap();
- SecuredModel setNsPrefixes( PrefixMapping other );
- SecuredModel setNsPrefixes( Map<String, String> map );
- SecuredModel withDefaultMappings( PrefixMapping map );
+ @Override SecuredModel setNsPrefix( String prefix, String uri );
+ @Override SecuredModel clearNsPrefixMap();
+ @Override SecuredModel setNsPrefixes( PrefixMapping other );
+ @Override SecuredModel setNsPrefixes( Map<String, String> map );
+ @Override SecuredModel withDefaultMappings( PrefixMapping map );
}
[2/2] jena git commit: Return Model from PrefixMapping methods.
Posted by aj...@apache.org.
Return Model from PrefixMapping methods.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/036ebce8
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/036ebce8
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/036ebce8
Branch: refs/heads/master
Commit: 036ebce8ed55d6e98c859eef0dcb32e1da96defe
Parents: 46e2f56
Author: jaco0646 <ja...@hotmail.com>
Authored: Fri Mar 2 19:06:51 2018 -0600
Committer: ajs6f <aj...@apache.org>
Committed: Fri Mar 9 10:27:12 2018 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/jena/rdf/model/Model.java | 8 ++++++++
.../java/org/apache/jena/rdf/model/impl/ModelCom.java | 12 ++++++------
.../org/apache/jena/permissions/model/SecuredModel.java | 10 +++++++++-
.../jena/permissions/model/impl/SecuredModelImpl.java | 12 ++++++------
4 files changed, 29 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/036ebce8/jena-core/src/main/java/org/apache/jena/rdf/model/Model.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/Model.java b/jena-core/src/main/java/org/apache/jena/rdf/model/Model.java
index 470b5f2..a7ef625 100644
--- a/jena-core/src/main/java/org/apache/jena/rdf/model/Model.java
+++ b/jena-core/src/main/java/org/apache/jena/rdf/model/Model.java
@@ -1051,4 +1051,12 @@ public interface Model
Answer true iff .close() has been called on this Model.
*/
public boolean isClosed();
+
+ // Override return type for methods inherited from PrefixMapping
+ Model setNsPrefix( String prefix, String uri );
+ Model removeNsPrefix( String prefix );
+ Model clearNsPrefixMap();
+ Model setNsPrefixes( PrefixMapping other );
+ Model setNsPrefixes( Map<String, String> map );
+ Model withDefaultMappings( PrefixMapping map );
}
http://git-wip-us.apache.org/repos/asf/jena/blob/036ebce8/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ModelCom.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ModelCom.java b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ModelCom.java
index 99ec9a8..4b632aa 100644
--- a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ModelCom.java
+++ b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ModelCom.java
@@ -1021,42 +1021,42 @@ implements Model, PrefixMapping, Lock
}
@Override
- public PrefixMapping setNsPrefix( String prefix, String uri )
+ public Model setNsPrefix( String prefix, String uri )
{
getPrefixMapping().setNsPrefix( prefix, uri );
return this;
}
@Override
- public PrefixMapping removeNsPrefix( String prefix )
+ public Model removeNsPrefix( String prefix )
{
getPrefixMapping().removeNsPrefix( prefix );
return this;
}
@Override
- public PrefixMapping clearNsPrefixMap()
+ public Model clearNsPrefixMap()
{
getPrefixMapping().clearNsPrefixMap();
return this ;
}
@Override
- public PrefixMapping setNsPrefixes( PrefixMapping pm )
+ public Model setNsPrefixes( PrefixMapping pm )
{
getPrefixMapping().setNsPrefixes( pm );
return this;
}
@Override
- public PrefixMapping setNsPrefixes( Map<String, String> map )
+ public Model setNsPrefixes( Map<String, String> map )
{
getPrefixMapping().setNsPrefixes( map );
return this;
}
@Override
- public PrefixMapping withDefaultMappings( PrefixMapping other )
+ public Model withDefaultMappings( PrefixMapping other )
{
getPrefixMapping().withDefaultMappings( other );
return this;
http://git-wip-us.apache.org/repos/asf/jena/blob/036ebce8/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredModel.java
----------------------------------------------------------------------
diff --git a/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredModel.java b/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredModel.java
index 0e7cd01..ba96073 100644
--- a/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredModel.java
+++ b/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredModel.java
@@ -24,6 +24,7 @@ import java.io.Writer;
import java.util.Calendar;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import org.apache.jena.datatypes.RDFDatatype;
import org.apache.jena.graph.Node;
@@ -41,6 +42,7 @@ import org.apache.jena.shared.DeleteDeniedException;
import org.apache.jena.shared.PropertyNotFoundException;
import org.apache.jena.shared.ReadDeniedException;
import org.apache.jena.shared.UpdateDeniedException;
+import org.apache.jena.shared.PrefixMapping;
/**
* The interface for secured Model instances.
@@ -1745,7 +1747,7 @@ public interface SecuredModel extends Model, SecuredPrefixMapping {
* if user is not authenticated and is required to be.
*/
@Override
- public SecuredPrefixMapping removeNsPrefix(final String prefix)
+ public SecuredModel removeNsPrefix(final String prefix)
throws UpdateDeniedException, AuthenticationRequiredException;
/**
@@ -1891,4 +1893,10 @@ public interface SecuredModel extends Model, SecuredPrefixMapping {
public SecuredModel write(final Writer writer, final String lang, final String base)
throws ReadDeniedException, AuthenticationRequiredException;
+ // Override return type for methods inherited from PrefixMapping
+ SecuredModel setNsPrefix( String prefix, String uri );
+ SecuredModel clearNsPrefixMap();
+ SecuredModel setNsPrefixes( PrefixMapping other );
+ SecuredModel setNsPrefixes( Map<String, String> map );
+ SecuredModel withDefaultMappings( PrefixMapping map );
}
http://git-wip-us.apache.org/repos/asf/jena/blob/036ebce8/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredModelImpl.java
----------------------------------------------------------------------
diff --git a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredModelImpl.java b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredModelImpl.java
index 98fb038..358d928 100644
--- a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredModelImpl.java
+++ b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredModelImpl.java
@@ -1869,7 +1869,7 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
}
@Override
- public SecuredPrefixMapping removeNsPrefix(final String prefix)
+ public SecuredModel removeNsPrefix(final String prefix)
throws UpdateDeniedException, AuthenticationRequiredException {
checkUpdate();
holder.getBaseItem().removeNsPrefix(prefix);
@@ -1877,7 +1877,7 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
}
@Override
- public SecuredPrefixMapping clearNsPrefixMap() {
+ public SecuredModel clearNsPrefixMap() {
checkUpdate();
holder.getBaseItem().clearNsPrefixMap();
return holder.getSecuredItem();
@@ -1908,7 +1908,7 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
}
@Override
- public SecuredPrefixMapping setNsPrefix(final String prefix, final String uri)
+ public SecuredModel setNsPrefix(final String prefix, final String uri)
throws UpdateDeniedException, AuthenticationRequiredException {
checkUpdate();
holder.getBaseItem().setNsPrefix(prefix, uri);
@@ -1916,7 +1916,7 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
}
@Override
- public SecuredPrefixMapping setNsPrefixes(final Map<String, String> map)
+ public SecuredModel setNsPrefixes(final Map<String, String> map)
throws UpdateDeniedException, AuthenticationRequiredException {
checkUpdate();
holder.getBaseItem().setNsPrefixes(map);
@@ -1924,7 +1924,7 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
}
@Override
- public SecuredPrefixMapping setNsPrefixes(final PrefixMapping other)
+ public SecuredModel setNsPrefixes(final PrefixMapping other)
throws UpdateDeniedException, AuthenticationRequiredException {
checkUpdate();
holder.getBaseItem().setNsPrefixes(other);
@@ -2010,7 +2010,7 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
}
@Override
- public SecuredPrefixMapping withDefaultMappings(final PrefixMapping map)
+ public SecuredModel withDefaultMappings(final PrefixMapping map)
throws UpdateDeniedException, AuthenticationRequiredException {
checkUpdate();
holder.getBaseItem().withDefaultMappings(map);