clerezza-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [2/6] clerezza git commit: CLEREZZA-961: renamed methods to match new Class names
Date Thu, 19 Mar 2015 21:34:36 GMT
CLEREZZA-961: renamed methods to match new Class names

Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/47cc3733
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/47cc3733
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/47cc3733

Branch: refs/heads/rdf-commons
Commit: 47cc3733e3653c04a4a74f71be30a3501a29025c
Parents: 340cdca
Author: Reto Gmuer <reto@apache.org>
Authored: Thu Mar 19 21:33:05 2015 +0000
Committer: Reto Gmuer <reto@apache.org>
Committed: Thu Mar 19 21:33:05 2015 +0000

----------------------------------------------------------------------
 rdf.core/pom.xml                                |  3 +--
 .../access/ImmutableGraphServiceFactory.java    |  2 +-
 .../clerezza/rdf/core/access/TcManager.java     | 20 +++++++--------
 .../clerezza/rdf/core/access/TcProvider.java    | 23 +++++++++--------
 .../rdf/core/access/TcProviderMultiplexer.java  | 22 ++++++++---------
 .../access/security/TcAccessController.java     |  2 +-
 .../clerezza/rdf/core/access/SecurityTest.java  | 26 ++++++++++----------
 .../clerezza/rdf/core/access/TcManagerTest.java | 16 ++++++------
 .../rdf/core/access/providers/WeightedA.java    | 10 ++++----
 .../rdf/core/access/providers/WeightedA1.java   | 10 ++++----
 .../core/access/providers/WeightedAHeavy.java   | 10 ++++----
 .../core/access/providers/WeightedBlight.java   | 10 ++++----
 .../core/access/providers/WeightedDummy.java    | 12 ++++-----
 13 files changed, 82 insertions(+), 84 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/clerezza/blob/47cc3733/rdf.core/pom.xml
----------------------------------------------------------------------
diff --git a/rdf.core/pom.xml b/rdf.core/pom.xml
index 134f93f..6fdb138 100644
--- a/rdf.core/pom.xml
+++ b/rdf.core/pom.xml
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr.ds-annotations</artifactId>
-            <version>1.2.4</version>
+            <version>1.2.8</version>
         </dependency>
         <dependency>
             <groupId>org.apache.clerezza</groupId>
@@ -122,7 +122,6 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-scr-plugin</artifactId>
-                <version>1.15.0</version>
                 <executions>
                     <execution>
                         <id>generate-scr-scrdescriptor</id>

http://git-wip-us.apache.org/repos/asf/clerezza/blob/47cc3733/rdf.core/src/main/java/org/apache/clerezza/rdf/core/access/ImmutableGraphServiceFactory.java
----------------------------------------------------------------------
diff --git a/rdf.core/src/main/java/org/apache/clerezza/rdf/core/access/ImmutableGraphServiceFactory.java
b/rdf.core/src/main/java/org/apache/clerezza/rdf/core/access/ImmutableGraphServiceFactory.java
index 900c8d8..b6ee4a1 100644
--- a/rdf.core/src/main/java/org/apache/clerezza/rdf/core/access/ImmutableGraphServiceFactory.java
+++ b/rdf.core/src/main/java/org/apache/clerezza/rdf/core/access/ImmutableGraphServiceFactory.java
@@ -47,7 +47,7 @@ public class ImmutableGraphServiceFactory implements ServiceFactory {
     @Override
     public Object getService(Bundle arg0, ServiceRegistration arg1) {
         Graph tc = 
-                new SecuredGraph(tcManager.getGraph(name), name,
+                new SecuredGraph(tcManager.getImmutableGraph(name), name,
                 tcAccessController);
         return tc.getImmutableGraph();
     }

http://git-wip-us.apache.org/repos/asf/clerezza/blob/47cc3733/rdf.core/src/main/java/org/apache/clerezza/rdf/core/access/TcManager.java
----------------------------------------------------------------------
diff --git a/rdf.core/src/main/java/org/apache/clerezza/rdf/core/access/TcManager.java b/rdf.core/src/main/java/org/apache/clerezza/rdf/core/access/TcManager.java
index 6e56479..45ced37 100644
--- a/rdf.core/src/main/java/org/apache/clerezza/rdf/core/access/TcManager.java
+++ b/rdf.core/src/main/java/org/apache/clerezza/rdf/core/access/TcManager.java
@@ -206,9 +206,9 @@ public class TcManager extends TcProviderMultiplexer {
     }
 
     @Override
-    public ImmutableGraph getGraph(Iri name) throws NoSuchEntityException {
+    public ImmutableGraph getImmutableGraph(Iri name) throws NoSuchEntityException {
         tcAccessController.checkReadPermission(name);
-        return super.getGraph(name);
+        return super.getImmutableGraph(name);
     }
 
     @Override
@@ -223,28 +223,28 @@ public class TcManager extends TcProviderMultiplexer {
     }
 
     @Override
-    public Graph getTriples(Iri name) {
+    public Graph getGraph(Iri name) {
         try {
             tcAccessController.checkReadWritePermission(name);
         } catch (AccessControlException e) {
             tcAccessController.checkReadPermission(name);
             return new WriteBlockedGraph(
-                    super.getTriples(name));
+                    super.getGraph(name));
         }
-        return super.getTriples(name);
+        return super.getGraph(name);
     }
 
     @Override
-    public Graph createMGraph(Iri name)
+    public Graph createGraph(Iri name)
             throws UnsupportedOperationException {
         tcAccessController.checkReadWritePermission(name);
-        return super.createMGraph(name);
+        return super.createGraph(name);
     }
 
     @Override
-    public ImmutableGraph createGraph(Iri name, Graph triples) {
+    public ImmutableGraph createImmutableGraph(Iri name, Graph triples) {
         tcAccessController.checkReadWritePermission(name);
-        return super.createGraph(name, triples);
+        return super.createImmutableGraph(name, triples);
     }
 
     @Override
@@ -395,7 +395,7 @@ public class TcManager extends TcProviderMultiplexer {
         }
         final QueryEngine queryEngine = this.queryEngine;
         if (queryEngine != null) {
-            return queryEngine.execute(this, this.getTriples(defaultGraphName), query);
+            return queryEngine.execute(this, this.getGraph(defaultGraphName), query);
         } else {
             throw new NoQueryEngineException();
         }

http://git-wip-us.apache.org/repos/asf/clerezza/blob/47cc3733/rdf.core/src/main/java/org/apache/clerezza/rdf/core/access/TcProvider.java
----------------------------------------------------------------------
diff --git a/rdf.core/src/main/java/org/apache/clerezza/rdf/core/access/TcProvider.java b/rdf.core/src/main/java/org/apache/clerezza/rdf/core/access/TcProvider.java
index 6a97ff7..2201e2a 100644
--- a/rdf.core/src/main/java/org/apache/clerezza/rdf/core/access/TcProvider.java
+++ b/rdf.core/src/main/java/org/apache/clerezza/rdf/core/access/TcProvider.java
@@ -22,7 +22,6 @@ import java.util.Set;
 
 import org.apache.commons.rdf.ImmutableGraph;
 import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Graph;
 import org.apache.commons.rdf.Iri;
 
 /**
@@ -41,10 +40,10 @@ public interface TcProvider {
      * @throws NoSuchEntityException if there is no <code>ImmutableGraph</code>
      *         with the specified name
      */
-    ImmutableGraph getGraph(Iri name) throws NoSuchEntityException;
+    ImmutableGraph getImmutableGraph(Iri name) throws NoSuchEntityException;
 
     /**
-     * Get an <code>Graph</code> by its name. The instances
+     * Get an <code>Graph</code> taht is not <code>ImmutableGrah</code>.
The instances
      * returned in different invocations are <code>equals</code>.
      *
      * @param the name of the <code>Graph</code>
@@ -56,18 +55,18 @@ public interface TcProvider {
     
     /**
      * This method is used to get a <code>Graph</code> indifferently
-     * whether it's a ImmutableGraph or an Graph. If the <code>name</code> names
an 
+     * whether it's a ImmutableGraph or not. If the <code>name</code> names an

      * <code>Graph</code> the result is the same as when invoking 
      * <code>getMGraph</code> with that argument, analogously for 
      * <code>ImmutableGraph</code>S the method returns an instance equals to
what 
-     * <code>getGraph</code> would return. 
+     * <code>getImmutableGraph</code> would return. 
      * 
      * @param name the name of the <Code>ImmutableGraph</code> or <code>Graph</code>
      * @return the <Code>ImmutableGraph</code> or <code>Graph</code>
      * @throws NoSuchEntityException if there is no <code>ImmutableGraph</code>
      *         or <code>Graph</code> with the specified name
      */
-    Graph getTriples(Iri name) throws NoSuchEntityException;
+    Graph getGraph(Iri name) throws NoSuchEntityException;
 
     /**
      * Lists the name of the <Code>ImmutableGraph</code>s available through this
@@ -81,7 +80,7 @@ public interface TcProvider {
 
     /**
      * Lists the name of the <Code>Graph</code>s available through this
-     * <code>TcProvider</code>, implementations may take into account the
+     * <code>TcProvider</code> that are not <Code>ImmutableGraph</code>,
implementations may take into account the
      * security context and omit <Code>Graph</code>s for which access is not
      * allowed.
      *
@@ -91,8 +90,8 @@ public interface TcProvider {
 
     /**
      * Lists the name of the <Code>Graph</code>s available through this
-     * <code>TcProvider</code> indifferently whether they are Graphs or an
-     * MGraphs, implementations may take into account the security context and
+     * <code>TcProvider</code> indifferently whether they are mutables or 
+     * immutables, implementations may take into account the security context and
      * omit <Code>Graph</code>s for which access is not allowed.
      *
      * @return the list of <Code>Graph</code>s
@@ -109,7 +108,7 @@ public interface TcProvider {
      * @throws EntityAlreadyExistsException if an Graph with the specified name
      *         already exists
      */
-    Graph createMGraph(Iri name) throws UnsupportedOperationException, 
+    Graph createGraph(Iri name) throws UnsupportedOperationException, 
             EntityAlreadyExistsException;
 
     /**
@@ -123,7 +122,7 @@ public interface TcProvider {
      * @throws EntityAlreadyExistsException if a ImmutableGraph with the specified name
      *         already exists
      */
-    ImmutableGraph createGraph(Iri name, Graph triples) 
+    ImmutableGraph createImmutableGraph(Iri name, Graph triples) 
             throws UnsupportedOperationException, EntityAlreadyExistsException;
     
     /**
@@ -148,5 +147,5 @@ public interface TcProvider {
      * @return the set names of <code>ImmutableGraph</code>, the set is empty
if
      *         <code>ImmutableGraph</code> is unknown
      */
-    Set<Iri> getNames(ImmutableGraph ImmutableGraph);
+    Set<Iri> getNames(ImmutableGraph immutableGraph);
 }

http://git-wip-us.apache.org/repos/asf/clerezza/blob/47cc3733/rdf.core/src/main/java/org/apache/clerezza/rdf/core/access/TcProviderMultiplexer.java
----------------------------------------------------------------------
diff --git a/rdf.core/src/main/java/org/apache/clerezza/rdf/core/access/TcProviderMultiplexer.java
b/rdf.core/src/main/java/org/apache/clerezza/rdf/core/access/TcProviderMultiplexer.java
index 2d2ca96..a084158 100644
--- a/rdf.core/src/main/java/org/apache/clerezza/rdf/core/access/TcProviderMultiplexer.java
+++ b/rdf.core/src/main/java/org/apache/clerezza/rdf/core/access/TcProviderMultiplexer.java
@@ -159,7 +159,7 @@ public class TcProviderMultiplexer implements TcProvider {
 	                    continue;
 	                }
 	            }
-	            Graph triples = newProvider.getTriples(name);
+	            Graph triples = newProvider.getGraph(name);
 	            if (triples instanceof Graph) {
 	           		mGraphCache.put(name, new MGraphHolder(newProvider, ensureLockable((Graph)triples)));
 	                mGraphAppears(name);
@@ -200,7 +200,7 @@ public class TcProviderMultiplexer implements TcProvider {
 	                // And if so register as service.
 	                for (WeightedTcProvider provider : providerList) {
 	                    try {
-	                        Graph triples = provider.getTriples(name);
+	                        Graph triples = provider.getGraph(name);
 	                        if (triples instanceof Graph) {
 	                       		mGraphCache.put(name, new MGraphHolder(provider, ensureLockable((Graph)triples)));
 	                            mGraphAppears(name);
@@ -218,10 +218,10 @@ public class TcProviderMultiplexer implements TcProvider {
     }
 
     @Override
-    public ImmutableGraph getGraph(Iri name) throws NoSuchEntityException {
+    public ImmutableGraph getImmutableGraph(Iri name) throws NoSuchEntityException {
         for (TcProvider provider : providerList) {
             try {
-                return provider.getGraph(name);
+                return provider.getImmutableGraph(name);
             } catch (NoSuchEntityException e) {
                 //we do nothing and try our luck with the next provider
             } catch (IllegalArgumentException e) {
@@ -276,12 +276,12 @@ public class TcProviderMultiplexer implements TcProvider {
     }
 
     @Override
-    public Graph getTriples(Iri name)
+    public Graph getGraph(Iri name)
             throws NoSuchEntityException {
         Graph result;
         for (WeightedTcProvider provider : providerList) {
             try {
-                result = provider.getTriples(name);
+                result = provider.getGraph(name);
                 if (result instanceof ImmutableGraph) {
                     return result;
                 } else {
@@ -298,12 +298,12 @@ public class TcProviderMultiplexer implements TcProvider {
     }
 
     @Override
-    public Graph createMGraph(Iri name)
+    public Graph createGraph(Iri name)
             throws UnsupportedOperationException {
 
         for (WeightedTcProvider provider : providerList) {
             try {
-                Graph result = provider.createMGraph(name);
+                Graph result = provider.createGraph(name);
                 // unregisters a possible ImmutableGraph or Graph service under this name
                 // provided by a WeightedTcProvider with a lower weight.
                 tcDisappears(name);
@@ -323,10 +323,10 @@ public class TcProviderMultiplexer implements TcProvider {
     }
 
     @Override
-    public ImmutableGraph createGraph(Iri name, Graph triples) {
+    public ImmutableGraph createImmutableGraph(Iri name, Graph triples) {
         for (WeightedTcProvider provider : providerList) {
             try {
-                ImmutableGraph result = provider.createGraph(name, triples);
+                ImmutableGraph result = provider.createImmutableGraph(name, triples);
 
                 // unregisters a possible ImmutableGraph or Graph service under this name
                 // provided by a WeightedTcProvider with a lower weight.
@@ -368,7 +368,7 @@ public class TcProviderMultiplexer implements TcProvider {
             }
         }
         // this throws a NoSuchEntityException if the ImmutableGraph doesn't exist
-        getTriples(name);
+        getGraph(name);
         // the entity exists but cannot be deleted
         throw new UnsupportedOperationException(
                 "No provider could delete the entity.");

http://git-wip-us.apache.org/repos/asf/clerezza/blob/47cc3733/rdf.core/src/main/java/org/apache/clerezza/rdf/core/access/security/TcAccessController.java
----------------------------------------------------------------------
diff --git a/rdf.core/src/main/java/org/apache/clerezza/rdf/core/access/security/TcAccessController.java
b/rdf.core/src/main/java/org/apache/clerezza/rdf/core/access/security/TcAccessController.java
index 155cccb..c4d1264 100644
--- a/rdf.core/src/main/java/org/apache/clerezza/rdf/core/access/security/TcAccessController.java
+++ b/rdf.core/src/main/java/org/apache/clerezza/rdf/core/access/security/TcAccessController.java
@@ -342,7 +342,7 @@ public abstract class TcAccessController {
         try {
             return tcManager.getMGraph(permissionGraphName);
         } catch (NoSuchEntityException e) {
-            return tcManager.createMGraph(permissionGraphName);
+            return tcManager.createGraph(permissionGraphName);
         }
     }
 

http://git-wip-us.apache.org/repos/asf/clerezza/blob/47cc3733/rdf.core/src/test/java/org/apache/clerezza/rdf/core/access/SecurityTest.java
----------------------------------------------------------------------
diff --git a/rdf.core/src/test/java/org/apache/clerezza/rdf/core/access/SecurityTest.java
b/rdf.core/src/test/java/org/apache/clerezza/rdf/core/access/SecurityTest.java
index deb0baf..97a0fd4 100644
--- a/rdf.core/src/test/java/org/apache/clerezza/rdf/core/access/SecurityTest.java
+++ b/rdf.core/src/test/java/org/apache/clerezza/rdf/core/access/SecurityTest.java
@@ -57,8 +57,8 @@ public class SecurityTest {
         ////needed to unbind because this is injected with META-INF/services - file
         TcManager.getInstance().unbindWeightedTcProvider(new WeightedA());
         TcManager.getInstance().bindWeightedTcProvider(new WeightedDummy());
-        TcManager.getInstance().createMGraph(new Iri("http://example.org/ImmutableGraph/alreadyexists"));
-        TcManager.getInstance().createMGraph(new Iri("http://example.org/read/ImmutableGraph"));
+        TcManager.getInstance().createGraph(new Iri("http://example.org/ImmutableGraph/alreadyexists"));
+        TcManager.getInstance().createGraph(new Iri("http://example.org/read/ImmutableGraph"));
     }
 
     @AfterClass
@@ -112,22 +112,22 @@ public class SecurityTest {
 
     @Test(expected=NoSuchEntityException.class)
     public void testAcessGraph() {        
-        TcManager.getInstance().getGraph(new Iri("http://example.org/permitted"));
+        TcManager.getInstance().getImmutableGraph(new Iri("http://example.org/permitted"));
     }
     
     @Test(expected=AccessControlException.class)
     public void testNoWildCard() {
-        TcManager.getInstance().getGraph(new Iri("http://example.org/permitted/subthing"));
+        TcManager.getInstance().getImmutableGraph(new Iri("http://example.org/permitted/subthing"));
     }
     
     @Test(expected=NoSuchEntityException.class)
     public void testAllowedArea() {
-        TcManager.getInstance().getGraph(new Iri("http://example.org/area/allowed/something"));
+        TcManager.getInstance().getImmutableGraph(new Iri("http://example.org/area/allowed/something"));
     }
     
     @Test(expected=AccessControlException.class)
     public void testAcessForbiddenGraph() {
-        TcManager.getInstance().getGraph(new Iri("http://example.org/forbidden"));
+        TcManager.getInstance().getImmutableGraph(new Iri("http://example.org/forbidden"));
     }
 
     @Test(expected=NoSuchEntityException.class)
@@ -136,7 +136,7 @@ public class SecurityTest {
         TcManager.getInstance().getTcAccessController().setRequiredReadPermissionStrings(graphUri,
                 Collections.singletonList("(java.io.FilePermission \"/etc\" \"write\")"));
         //new FilePermission("/etc", "write").toString()));
-        Graph ag = TcManager.getInstance().getTriples(new Iri("urn:x-localinstance:/ImmutableGraph-access.ImmutableGraph"));
+        Graph ag = TcManager.getInstance().getGraph(new Iri("urn:x-localinstance:/ImmutableGraph-access.ImmutableGraph"));
         System.out.print(ag.toString());
         TcManager.getInstance().getMGraph(graphUri);
     }
@@ -147,9 +147,9 @@ public class SecurityTest {
         TcManager.getInstance().getTcAccessController().setRequiredReadPermissionStrings(graphUri,
                 Collections.singletonList("(java.io.FilePermission \"/etc\" \"write\")"));
         //new FilePermission("/etc", "write").toString()));
-        Graph ag = TcManager.getInstance().getTriples(new Iri("urn:x-localinstance:/ImmutableGraph-access.ImmutableGraph"));
+        Graph ag = TcManager.getInstance().getGraph(new Iri("urn:x-localinstance:/ImmutableGraph-access.ImmutableGraph"));
         System.out.print(ag.toString());
-        TcManager.getInstance().createMGraph(graphUri);
+        TcManager.getInstance().createGraph(graphUri);
     }
 
     @Test
@@ -158,18 +158,18 @@ public class SecurityTest {
         TcManager.getInstance().getTcAccessController().setRequiredReadWritePermissionStrings(graphUri,
                 Collections.singletonList("(java.io.FilePermission \"/etc\" \"write\")"));
         //new FilePermission("/etc", "write").toString()));
-        Graph ag = TcManager.getInstance().getTriples(new Iri("urn:x-localinstance:/ImmutableGraph-access.ImmutableGraph"));
+        Graph ag = TcManager.getInstance().getGraph(new Iri("urn:x-localinstance:/ImmutableGraph-access.ImmutableGraph"));
         System.out.print(ag.toString());
-        TcManager.getInstance().createMGraph(graphUri);
+        TcManager.getInstance().createGraph(graphUri);
     }
     
     @Test(expected=EntityAlreadyExistsException.class)
     public void testCreateMGraph() {
-        TcManager.getInstance().createMGraph(new Iri("http://example.org/ImmutableGraph/alreadyexists"));
+        TcManager.getInstance().createGraph(new Iri("http://example.org/ImmutableGraph/alreadyexists"));
     }
     @Test(expected=AccessControlException.class)
     public void testCreateMGraphWithoutWritePermission() {
-        TcManager.getInstance().createMGraph(new Iri("http://example.org/read/ImmutableGraph"));
+        TcManager.getInstance().createGraph(new Iri("http://example.org/read/ImmutableGraph"));
     }
     @Test(expected=ReadOnlyException.class)
     public void testAddTripleToMGraph() {

http://git-wip-us.apache.org/repos/asf/clerezza/blob/47cc3733/rdf.core/src/test/java/org/apache/clerezza/rdf/core/access/TcManagerTest.java
----------------------------------------------------------------------
diff --git a/rdf.core/src/test/java/org/apache/clerezza/rdf/core/access/TcManagerTest.java
b/rdf.core/src/test/java/org/apache/clerezza/rdf/core/access/TcManagerTest.java
index 59ce257..138fe34 100644
--- a/rdf.core/src/test/java/org/apache/clerezza/rdf/core/access/TcManagerTest.java
+++ b/rdf.core/src/test/java/org/apache/clerezza/rdf/core/access/TcManagerTest.java
@@ -82,11 +82,11 @@ public class TcManagerTest {
 
 	@Test
 	public void getGraphFromA() {
-		ImmutableGraph graphA = graphAccess.getGraph(uriRefA);
+		ImmutableGraph graphA = graphAccess.getImmutableGraph(uriRefA);
 		Iterator<Triple> iterator = graphA.iterator();
 		assertEquals(new TripleImpl(uriRefA, uriRefA, uriRefA), iterator.next());
 		assertFalse(iterator.hasNext());
-		Graph triplesA = graphAccess.getTriples(uriRefA);
+		Graph triplesA = graphAccess.getGraph(uriRefA);
 		iterator = triplesA.iterator();
 		assertEquals(new TripleImpl(uriRefA, uriRefA, uriRefA), iterator.next());
 		assertFalse(iterator.hasNext());
@@ -94,11 +94,11 @@ public class TcManagerTest {
 
 	@Test
 	public void getGraphFromB() {
-		ImmutableGraph graphA = graphAccess.getGraph(uriRefB);
+		ImmutableGraph graphA = graphAccess.getImmutableGraph(uriRefB);
 		Iterator<Triple> iterator = graphA.iterator();
 		assertEquals(new TripleImpl(uriRefB, uriRefB, uriRefB), iterator.next());
 		assertFalse(iterator.hasNext());
-		Graph triplesA = graphAccess.getTriples(uriRefB);
+		Graph triplesA = graphAccess.getGraph(uriRefB);
 		iterator = triplesA.iterator();
 		assertEquals(new TripleImpl(uriRefB, uriRefB, uriRefB), iterator.next());
 		assertFalse(iterator.hasNext());
@@ -107,12 +107,12 @@ public class TcManagerTest {
 	@Test
 	public void getGraphFromAAfterUnbinding() {
 		graphAccess.unbindWeightedTcProvider(weightedA);
-		ImmutableGraph graphA = graphAccess.getGraph(uriRefA);
+		ImmutableGraph graphA = graphAccess.getImmutableGraph(uriRefA);
 		Iterator<Triple> iterator = graphA.iterator();
 		assertEquals(new TripleImpl(uriRefA1, uriRefA1, uriRefA1),
 				iterator.next());
 		assertFalse(iterator.hasNext());
-		Graph triplesA = graphAccess.getTriples(uriRefA);
+		Graph triplesA = graphAccess.getGraph(uriRefA);
 		iterator = triplesA.iterator();
 		assertEquals(new TripleImpl(uriRefA1, uriRefA1, uriRefA1),
 				iterator.next());
@@ -123,12 +123,12 @@ public class TcManagerTest {
 	public void getGraphFromAWithHeavy() {
 		final WeightedAHeavy weightedAHeavy = new WeightedAHeavy();
 		graphAccess.bindWeightedTcProvider(weightedAHeavy);
-		ImmutableGraph graphA = graphAccess.getGraph(uriRefA);
+		ImmutableGraph graphA = graphAccess.getImmutableGraph(uriRefA);
 		Iterator<Triple> iterator = graphA.iterator();
 		assertEquals(new TripleImpl(uriRefAHeavy, uriRefAHeavy, uriRefAHeavy),
 				iterator.next());
 		assertFalse(iterator.hasNext());
-		Graph triplesA = graphAccess.getTriples(uriRefA);
+		Graph triplesA = graphAccess.getGraph(uriRefA);
 		iterator = triplesA.iterator();
 		assertEquals(new TripleImpl(uriRefAHeavy, uriRefAHeavy, uriRefAHeavy),
 				iterator.next());

http://git-wip-us.apache.org/repos/asf/clerezza/blob/47cc3733/rdf.core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedA.java
----------------------------------------------------------------------
diff --git a/rdf.core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedA.java
b/rdf.core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedA.java
index f61bd44..364d252 100644
--- a/rdf.core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedA.java
+++ b/rdf.core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedA.java
@@ -44,7 +44,7 @@ public class WeightedA implements WeightedTcProvider {
     }
 
     @Override
-    public ImmutableGraph getGraph(Iri name) throws NoSuchEntityException {
+    public ImmutableGraph getImmutableGraph(Iri name) throws NoSuchEntityException {
         if (name.equals(TcManagerTest.uriRefA)) {
             Graph mResult = new SimpleMGraph();
             mResult.add(new TripleImpl(TcManagerTest.uriRefA, 
@@ -61,17 +61,17 @@ public class WeightedA implements WeightedTcProvider {
     }
 
     @Override
-    public Graph getTriples(Iri name) throws NoSuchEntityException {
-        return getGraph(name);
+    public Graph getGraph(Iri name) throws NoSuchEntityException {
+        return getImmutableGraph(name);
     }
 
     @Override
-    public Graph createMGraph(Iri name) {
+    public Graph createGraph(Iri name) {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
     @Override
-    public ImmutableGraph createGraph(Iri name, Graph triples) {
+    public ImmutableGraph createImmutableGraph(Iri name, Graph triples) {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 

http://git-wip-us.apache.org/repos/asf/clerezza/blob/47cc3733/rdf.core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedA1.java
----------------------------------------------------------------------
diff --git a/rdf.core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedA1.java
b/rdf.core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedA1.java
index 4a9bcf2..2fe8336 100644
--- a/rdf.core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedA1.java
+++ b/rdf.core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedA1.java
@@ -45,7 +45,7 @@ public class WeightedA1 implements WeightedTcProvider {
     }
 
     @Override
-    public ImmutableGraph getGraph(Iri name) throws NoSuchEntityException {
+    public ImmutableGraph getImmutableGraph(Iri name) throws NoSuchEntityException {
         if (name.equals(TcManagerTest.uriRefA)) {
             Graph mResult = new SimpleMGraph();
             mResult.add(new TripleImpl(TcManagerTest.uriRefA1, 
@@ -62,17 +62,17 @@ public class WeightedA1 implements WeightedTcProvider {
     }
 
     @Override
-    public Graph getTriples(Iri name) throws NoSuchEntityException {
-        return getGraph(name);
+    public Graph getGraph(Iri name) throws NoSuchEntityException {
+        return getImmutableGraph(name);
     }
 
     @Override
-    public Graph createMGraph(Iri name) {
+    public Graph createGraph(Iri name) {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
     @Override
-    public ImmutableGraph createGraph(Iri name, Graph triples) {
+    public ImmutableGraph createImmutableGraph(Iri name, Graph triples) {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 

http://git-wip-us.apache.org/repos/asf/clerezza/blob/47cc3733/rdf.core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedAHeavy.java
----------------------------------------------------------------------
diff --git a/rdf.core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedAHeavy.java
b/rdf.core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedAHeavy.java
index 82307ad..c0cec77 100644
--- a/rdf.core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedAHeavy.java
+++ b/rdf.core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedAHeavy.java
@@ -46,7 +46,7 @@ public class WeightedAHeavy implements WeightedTcProvider {
     }
 
     @Override
-    public ImmutableGraph getGraph(Iri name) throws NoSuchEntityException {
+    public ImmutableGraph getImmutableGraph(Iri name) throws NoSuchEntityException {
         if (name.equals(TcManagerTest.uriRefA)) {
             Graph mResult = new SimpleGraph();
             mResult.add(new TripleImpl(TcManagerTest.uriRefAHeavy, 
@@ -62,17 +62,17 @@ public class WeightedAHeavy implements WeightedTcProvider {
     }
 
     @Override
-    public Graph getTriples(Iri name) throws NoSuchEntityException {
-        return getGraph(name);
+    public Graph getGraph(Iri name) throws NoSuchEntityException {
+        return getImmutableGraph(name);
     }
 
     @Override
-    public Graph createMGraph(Iri name) {
+    public Graph createGraph(Iri name) {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
     @Override
-    public ImmutableGraph createGraph(Iri name, Graph triples) {
+    public ImmutableGraph createImmutableGraph(Iri name, Graph triples) {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 

http://git-wip-us.apache.org/repos/asf/clerezza/blob/47cc3733/rdf.core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedBlight.java
----------------------------------------------------------------------
diff --git a/rdf.core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedBlight.java
b/rdf.core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedBlight.java
index c5023d8..ef7068f 100644
--- a/rdf.core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedBlight.java
+++ b/rdf.core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedBlight.java
@@ -44,7 +44,7 @@ public class WeightedBlight implements WeightedTcProvider {
     }
 
     @Override
-    public ImmutableGraph getGraph(Iri name) throws NoSuchEntityException {
+    public ImmutableGraph getImmutableGraph(Iri name) throws NoSuchEntityException {
         if (name.equals(TcManagerTest.uriRefB)) {
             Graph mResult = new SimpleMGraph();
             mResult.add(new TripleImpl(TcManagerTest.uriRefB, TcManagerTest.uriRefB, TcManagerTest.uriRefB));
@@ -64,17 +64,17 @@ public class WeightedBlight implements WeightedTcProvider {
     }
 
     @Override
-    public Graph getTriples(Iri name) throws NoSuchEntityException {
-        return getGraph(name);
+    public Graph getGraph(Iri name) throws NoSuchEntityException {
+        return getImmutableGraph(name);
     }
 
     @Override
-    public Graph createMGraph(Iri name) {
+    public Graph createGraph(Iri name) {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
     @Override
-    public ImmutableGraph createGraph(Iri name, Graph triples) {
+    public ImmutableGraph createImmutableGraph(Iri name, Graph triples) {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 

http://git-wip-us.apache.org/repos/asf/clerezza/blob/47cc3733/rdf.core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedDummy.java
----------------------------------------------------------------------
diff --git a/rdf.core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedDummy.java
b/rdf.core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedDummy.java
index 183d1f7..b464033 100644
--- a/rdf.core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedDummy.java
+++ b/rdf.core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedDummy.java
@@ -43,7 +43,7 @@ public class WeightedDummy implements WeightedTcProvider {
     private Map<Iri, Graph> tripleMap = new HashMap<Iri, Graph>();
 
     @Override
-    public ImmutableGraph createGraph(Iri name, Graph triples)
+    public ImmutableGraph createImmutableGraph(Iri name, Graph triples)
             throws EntityAlreadyExistsException {
         if ((name == null) || (name.getUnicodeString() == null)
                 || (name.getUnicodeString().trim().length() == 0)) {
@@ -53,7 +53,7 @@ public class WeightedDummy implements WeightedTcProvider {
         try {
             // throws NoSuchEntityException if a Graph with that name
             // already exists
-            this.getTriples(name);
+            this.getGraph(name);
         } catch (NoSuchEntityException e) {
             ImmutableGraph result;
             if (ImmutableGraph.class.isAssignableFrom(triples.getClass())) {
@@ -69,7 +69,7 @@ public class WeightedDummy implements WeightedTcProvider {
     }
 
     @Override
-    public Graph createMGraph(Iri name) throws EntityAlreadyExistsException {
+    public Graph createGraph(Iri name) throws EntityAlreadyExistsException {
         if ((name == null) || (name.getUnicodeString() == null)
                 || (name.getUnicodeString().trim().length() == 0)) {
             throw new IllegalArgumentException("Name must not be null");
@@ -78,7 +78,7 @@ public class WeightedDummy implements WeightedTcProvider {
         try {
             // throws NoSuchEntityException if a Graph with that name
             // already exists
-            this.getTriples(name);
+            this.getGraph(name);
         } catch (NoSuchEntityException e) {
             Graph result = new SimpleMGraph();
             tripleMap.put(name, result);
@@ -96,7 +96,7 @@ public class WeightedDummy implements WeightedTcProvider {
     }
 
     @Override
-    public ImmutableGraph getGraph(Iri name) throws NoSuchEntityException {
+    public ImmutableGraph getImmutableGraph(Iri name) throws NoSuchEntityException {
         Graph Graph = tripleMap.get(name);
         if (Graph == null) {
             throw new NoSuchEntityException(name);
@@ -124,7 +124,7 @@ public class WeightedDummy implements WeightedTcProvider {
     }
 
     @Override
-    public Graph getTriples(Iri name)
+    public Graph getGraph(Iri name)
             throws NoSuchEntityException {
         Graph Graph = tripleMap.get(name);
         if (Graph == null) {


Mime
View raw message