You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ss...@apache.org on 2016/11/19 17:45:16 UTC
[3/6] marmotta git commit: code style cleanups across the whole
source code
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/sle/SleUtility.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/sle/SleUtility.java b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/sle/SleUtility.java
index a44c2be..6a6a814 100644
--- a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/sle/SleUtility.java
+++ b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/sle/SleUtility.java
@@ -18,15 +18,15 @@
package org.rometools.feed.module.sle;
import com.sun.syndication.feed.module.Extendable;
-import org.rometools.feed.module.sle.io.ModuleParser;
-import org.rometools.feed.module.sle.types.Group;
-import org.rometools.feed.module.sle.types.Sort;
import com.sun.syndication.feed.synd.SyndFeed;
import com.sun.syndication.io.FeedException;
import com.sun.syndication.io.SyndFeedInput;
import com.sun.syndication.io.SyndFeedOutput;
import com.sun.syndication.io.impl.ModuleGenerators;
import org.jdom2.Document;
+import org.rometools.feed.module.sle.io.ModuleParser;
+import org.rometools.feed.module.sle.types.Group;
+import org.rometools.feed.module.sle.types.Sort;
import java.util.ArrayList;
import java.util.Collection;
@@ -117,8 +117,8 @@ public class SleUtility {
- private static interface ValueStrategy {
- public Comparable getValue(Extendable o, Object valueName);
+ private interface ValueStrategy {
+ Comparable getValue(Extendable o, Object valueName);
}
private static class GroupStrategy implements ValueStrategy {
@@ -128,7 +128,7 @@ public class SleUtility {
try {
oc = (Comparable) ((SleEntry) o.getModule(ModuleParser.TEMP.getURI())).getGroupByElement((Group)value).getValue();
} catch (NullPointerException npe) {
- ; // watch it go by
+ // watch it go by
}
return oc;
@@ -141,7 +141,7 @@ public class SleUtility {
try {
oc = (Comparable) ((SleEntry) o.getModule(ModuleParser.TEMP.getURI())).getSortByElement((Sort)value).getValue();
} catch (NullPointerException npe) {
- ; // watch it go by
+ // watch it go by
}
return oc;
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/sle/io/ItemParser.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/sle/io/ItemParser.java b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/sle/io/ItemParser.java
index 9a17e7a..2aaf3e0 100644
--- a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/sle/io/ItemParser.java
+++ b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/sle/io/ItemParser.java
@@ -18,22 +18,16 @@
package org.rometools.feed.module.sle.io;
import com.sun.syndication.feed.module.Module;
-import org.rometools.feed.module.sle.SleEntryImpl;
-import org.rometools.feed.module.sle.types.DateValue;
-import org.rometools.feed.module.sle.types.EntryValue;
-import org.rometools.feed.module.sle.types.NumberValue;
-import org.rometools.feed.module.sle.types.Sort;
-import org.rometools.feed.module.sle.types.StringValue;
import com.sun.syndication.io.impl.DateParser;
-
import org.jdom2.Element;
+import org.jdom2.Namespace;
+import org.rometools.feed.module.sle.SleEntryImpl;
+import org.rometools.feed.module.sle.types.*;
import java.math.BigDecimal;
-
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import org.jdom2.Namespace;
/**
@@ -119,7 +113,7 @@ public class ItemParser implements com.sun.syndication.io.ModuleParser {
dateValue = DateParser.parseRFC822(sort.getAttributeValue("value"));
dateValue = (dateValue == null) ? DateParser.parseW3CDateTime(sort.getAttributeValue("value")) : dateValue;
} catch (Exception e) {
- ; // ignore parse exceptions
+ // ignore parse exceptions
}
value.setValue(dateValue);
@@ -137,7 +131,7 @@ public class ItemParser implements com.sun.syndication.io.ModuleParser {
try {
value.setValue(new BigDecimal(sort.getAttributeValue("value")));
} catch (NumberFormatException nfe) {
- ; // ignore
+ // ignore
values.add(value);
element.removeContent(sort);
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/sle/io/ModuleGenerator.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/sle/io/ModuleGenerator.java b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/sle/io/ModuleGenerator.java
index 68092d5..57ecb79 100644
--- a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/sle/io/ModuleGenerator.java
+++ b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/sle/io/ModuleGenerator.java
@@ -9,13 +9,12 @@
package org.rometools.feed.module.sle.io;
import com.sun.syndication.feed.module.Module;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
import org.rometools.feed.module.sle.SimpleListExtension;
import org.rometools.feed.module.sle.types.Group;
import org.rometools.feed.module.sle.types.Sort;
-import org.jdom2.Element;
-import org.jdom2.Namespace;
-
import java.util.HashSet;
import java.util.Set;
@@ -115,9 +114,7 @@ public class ModuleGenerator implements com.sun.syndication.io.ModuleGenerator {
}
protected void addNotNullAttribute(Element target, String name, Object value) {
- if ((target == null) || (value == null)) {
- return;
- } else {
+ if (target != null && value != null) {
target.setAttribute(name, value.toString());
}
}
@@ -125,12 +122,12 @@ public class ModuleGenerator implements com.sun.syndication.io.ModuleGenerator {
protected Element addNotNullElement(Element target, String name, Object value) {
if (value == null) {
return null;
- } else {
- Element e = generateSimpleElement(name, value.toString());
- target.addContent(e);
-
- return e;
}
+
+ Element e = generateSimpleElement(name, value.toString());
+ target.addContent(e);
+
+ return e;
}
protected Element generateSimpleElement(String name, String value) {
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/sle/io/ModuleParser.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/sle/io/ModuleParser.java b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/sle/io/ModuleParser.java
index c6da128..ae2dd0c 100644
--- a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/sle/io/ModuleParser.java
+++ b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/sle/io/ModuleParser.java
@@ -18,14 +18,13 @@
package org.rometools.feed.module.sle.io;
import com.sun.syndication.feed.module.Module;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
import org.rometools.feed.module.sle.SimpleListExtension;
import org.rometools.feed.module.sle.SimpleListExtensionImpl;
import org.rometools.feed.module.sle.types.Group;
import org.rometools.feed.module.sle.types.Sort;
-import org.jdom2.Element;
-import org.jdom2.Namespace;
-
import java.util.ArrayList;
import java.util.List;
@@ -92,7 +91,7 @@ public class ModuleParser implements com.sun.syndication.io.ModuleParser {
String elementName = se.getAttributeValue("element");
String label = se.getAttributeValue("label");
String dataType = se.getAttributeValue("data-type");
- boolean defaultOrder = (se.getAttributeValue("default") == null) ? false : new Boolean(se.getAttributeValue("default")).booleanValue();
+ boolean defaultOrder = se.getAttributeValue("default") != null && new Boolean(se.getAttributeValue("default")).booleanValue();
values.add(new Sort(ns, elementName, dataType, label, defaultOrder));
}
@@ -103,9 +102,7 @@ public class ModuleParser implements com.sun.syndication.io.ModuleParser {
}
protected void addNotNullAttribute(Element target, String name, Object value) {
- if ((target == null) || (value == null)) {
- return;
- } else {
+ if (target != null && value != null) {
target.setAttribute(name, value.toString());
}
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/sle/types/EntryValue.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/sle/types/EntryValue.java b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/sle/types/EntryValue.java
index 9030df7..6748407 100644
--- a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/sle/types/EntryValue.java
+++ b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/sle/types/EntryValue.java
@@ -17,9 +17,10 @@
*/
package org.rometools.feed.module.sle.types;
-import java.io.Serializable;
import org.jdom2.Namespace;
+import java.io.Serializable;
+
/**
* An interface that parents data types for sorting and grouping.
@@ -30,23 +31,23 @@ public interface EntryValue extends Serializable, Cloneable {
* Returns the name of the element.
* @return Returns the name of the element.
*/
- public String getElement();
+ String getElement();
/**
* Returns a label for the element.
* @return Returns a label for the element.
*/
- public String getLabel();
+ String getLabel();
/**
* Returns the value of the element.
* @return Returns the value of the element.
*/
- public Comparable getValue();
+ Comparable getValue();
/**
* Returns the namespace of the element.
* @return Returns the namespace of the element.
*/
- public Namespace getNamespace();
+ Namespace getNamespace();
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/yahooweather/YWeatherEntryModule.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/yahooweather/YWeatherEntryModule.java b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/yahooweather/YWeatherEntryModule.java
index 941f4c5..84e97ac 100644
--- a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/yahooweather/YWeatherEntryModule.java
+++ b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/yahooweather/YWeatherEntryModule.java
@@ -50,23 +50,23 @@ public interface YWeatherEntryModule extends YWeatherModule {
* The current conditions.
* @return The current conditions.
*/
- public Condition getCondition();
+ Condition getCondition();
/**
* The current conditions.
* @param condition The current conditions.
*/
- public void setCondition(Condition condition);
+ void setCondition(Condition condition);
/**
* Forecasts for this location.
* @return Forecasts for this location.
*/
- public Forecast[] getForecasts();
+ Forecast[] getForecasts();
/**
* Forecasts for this location.
* @param forecasts Forecasts for this location.
*/
- public void setForecasts(Forecast[] forecasts);
+ void setForecasts(Forecast[] forecasts);
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/yahooweather/YWeatherFeedModule.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/yahooweather/YWeatherFeedModule.java b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/yahooweather/YWeatherFeedModule.java
index 1e3df6c..4d53eb0 100644
--- a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/yahooweather/YWeatherFeedModule.java
+++ b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/yahooweather/YWeatherFeedModule.java
@@ -35,11 +35,7 @@
*/
package org.rometools.feed.module.yahooweather;
-import org.rometools.feed.module.yahooweather.types.Astronomy;
-import org.rometools.feed.module.yahooweather.types.Atmosphere;
-import org.rometools.feed.module.yahooweather.types.Location;
-import org.rometools.feed.module.yahooweather.types.Units;
-import org.rometools.feed.module.yahooweather.types.Wind;
+import org.rometools.feed.module.yahooweather.types.*;
/**
@@ -52,59 +48,59 @@ public interface YWeatherFeedModule extends YWeatherModule {
* The location the feed is for.
* @return The location the feed is for.
*/
- public Location getLocation();
+ Location getLocation();
/**
* The location the feed is for.
* @param location The location the feed is for.
*/
- public void setLocation(Location location);
+ void setLocation(Location location);
/**
* Astronomical information for the location.
* @return Astronomical information for the location.
*/
- public Astronomy getAstronomy();
+ Astronomy getAstronomy();
/**
* Astronomical information for the location.
* @param astronomy Astronomical information for the location.
*/
- public void setAstronomy(Astronomy astronomy);
+ void setAstronomy(Astronomy astronomy);
/**
* Units that data in the feed is provided in.
* @return Units that data in the feed is provided in.
*/
- public Units getUnits();
+ Units getUnits();
/**
* Units that data in the feed is provided in.
* @param units Units that data in the feed is provided in.
*/
- public void setUnits(Units units);
+ void setUnits(Units units);
/**
* Current wind conditions at the location.
* @return Current wind conditions at the location.
*/
- public Wind getWind();
+ Wind getWind();
/**
* Current wind conditions at the location.
* @param wind Current wind conditions at the location.
*/
- public void setWind(Wind wind);
+ void setWind(Wind wind);
/**
* The current atmospheric conditions.
* @return Atmosphere object.
*/
- public Atmosphere getAtmosphere();
+ Atmosphere getAtmosphere();
/**
* Sets the current atmopheric condictions
* @param value Atmosphere object.
*/
- public void setAtmosphere(Atmosphere value);
+ void setAtmosphere(Atmosphere value);
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/yahooweather/YWeatherModule.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/yahooweather/YWeatherModule.java b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/yahooweather/YWeatherModule.java
index 59146f6..4961a91 100644
--- a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/yahooweather/YWeatherModule.java
+++ b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/yahooweather/YWeatherModule.java
@@ -48,5 +48,5 @@ public interface YWeatherModule extends Module {
/**
* "http://xml.weather.yahoo.com/ns/rss/1.0"
*/
- public static String URI = "http://xml.weather.yahoo.com/ns/rss/1.0";
+ String URI = "http://xml.weather.yahoo.com/ns/rss/1.0";
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/yahooweather/YWeatherModuleImpl.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/yahooweather/YWeatherModuleImpl.java b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/yahooweather/YWeatherModuleImpl.java
index 3dc2013..65ffaa7 100644
--- a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/yahooweather/YWeatherModuleImpl.java
+++ b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/yahooweather/YWeatherModuleImpl.java
@@ -37,13 +37,7 @@ package org.rometools.feed.module.yahooweather;
import com.sun.syndication.feed.CopyFrom;
import com.sun.syndication.feed.module.ModuleImpl;
-import org.rometools.feed.module.yahooweather.types.Astronomy;
-import org.rometools.feed.module.yahooweather.types.Atmosphere;
-import org.rometools.feed.module.yahooweather.types.Condition;
-import org.rometools.feed.module.yahooweather.types.Forecast;
-import org.rometools.feed.module.yahooweather.types.Location;
-import org.rometools.feed.module.yahooweather.types.Units;
-import org.rometools.feed.module.yahooweather.types.Wind;
+import org.rometools.feed.module.yahooweather.types.*;
/**
@@ -153,7 +147,7 @@ public class YWeatherModuleImpl extends ModuleImpl
this.atmosphere = atmosphere;
}
- public static interface CopyFromInterface extends YWeatherFeedModule,
+ public interface CopyFromInterface extends YWeatherFeedModule,
YWeatherEntryModule {
}
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-sail-transactions/src/main/java/org/apache/marmotta/commons/sesame/transactions/api/TransactionListener.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-sail-transactions/src/main/java/org/apache/marmotta/commons/sesame/transactions/api/TransactionListener.java b/commons/marmotta-sesame-tools/marmotta-sail-transactions/src/main/java/org/apache/marmotta/commons/sesame/transactions/api/TransactionListener.java
index 51152d0..bb866d8 100644
--- a/commons/marmotta-sesame-tools/marmotta-sail-transactions/src/main/java/org/apache/marmotta/commons/sesame/transactions/api/TransactionListener.java
+++ b/commons/marmotta-sesame-tools/marmotta-sail-transactions/src/main/java/org/apache/marmotta/commons/sesame/transactions/api/TransactionListener.java
@@ -33,7 +33,7 @@ public interface TransactionListener {
*
* @param data
*/
- public void beforeCommit(TransactionData data);
+ void beforeCommit(TransactionData data);
/**
* Called after a transaction has committed. The transaction data will contain all changes done in the transaction since
@@ -43,10 +43,10 @@ public interface TransactionListener {
*
* @param data
*/
- public void afterCommit(TransactionData data);
+ void afterCommit(TransactionData data);
/**
* Called when a transaction rolls back.
*/
- public void rollback(TransactionData data);
+ void rollback(TransactionData data);
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-sail-transactions/src/main/java/org/apache/marmotta/commons/sesame/transactions/api/TransactionalSail.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-sail-transactions/src/main/java/org/apache/marmotta/commons/sesame/transactions/api/TransactionalSail.java b/commons/marmotta-sesame-tools/marmotta-sail-transactions/src/main/java/org/apache/marmotta/commons/sesame/transactions/api/TransactionalSail.java
index cf416fd..743f5d6 100644
--- a/commons/marmotta-sesame-tools/marmotta-sail-transactions/src/main/java/org/apache/marmotta/commons/sesame/transactions/api/TransactionalSail.java
+++ b/commons/marmotta-sesame-tools/marmotta-sail-transactions/src/main/java/org/apache/marmotta/commons/sesame/transactions/api/TransactionalSail.java
@@ -33,20 +33,20 @@ public interface TransactionalSail extends NotifyingSail {
*
* @param listener the listener to add to the list
*/
- public void addTransactionListener(TransactionListener listener);
+ void addTransactionListener(TransactionListener listener);
/**
* Remove a transaction listener from the list.
*
* @param listener the listener to remove
*/
- public void removeTransactionListener(TransactionListener listener);
+ void removeTransactionListener(TransactionListener listener);
/**
* Check if extended transaction support is enabled
* @return true if extended transactions are enabled
*/
- public boolean isTransactionsEnabled();
+ boolean isTransactionsEnabled();
/**
* Temporarily enable/disable extended transactions. Disabling transactions might be useful when bulk loading large
@@ -54,7 +54,7 @@ public interface TransactionalSail extends NotifyingSail {
*
* @param transactionsEnabled
*/
- public void setTransactionsEnabled(boolean transactionsEnabled);
+ void setTransactionsEnabled(boolean transactionsEnabled);
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-sail-transactions/src/main/java/org/apache/marmotta/commons/sesame/transactions/api/TransactionalSailConnection.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-sail-transactions/src/main/java/org/apache/marmotta/commons/sesame/transactions/api/TransactionalSailConnection.java b/commons/marmotta-sesame-tools/marmotta-sail-transactions/src/main/java/org/apache/marmotta/commons/sesame/transactions/api/TransactionalSailConnection.java
index d408c34..b6c1e27 100644
--- a/commons/marmotta-sesame-tools/marmotta-sail-transactions/src/main/java/org/apache/marmotta/commons/sesame/transactions/api/TransactionalSailConnection.java
+++ b/commons/marmotta-sesame-tools/marmotta-sail-transactions/src/main/java/org/apache/marmotta/commons/sesame/transactions/api/TransactionalSailConnection.java
@@ -33,13 +33,13 @@ public interface TransactionalSailConnection extends NotifyingSailConnection {
*
* @param listener the listener to add to the list
*/
- public void addTransactionListener(TransactionListener listener);
+ void addTransactionListener(TransactionListener listener);
/**
* Remove a transaction listener from the list.
*
* @param listener the listener to remove
*/
- public void removeTransactionListener(TransactionListener listener);
+ void removeTransactionListener(TransactionListener listener);
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-util-facading/src/main/java/org/apache/marmotta/commons/sesame/facading/api/Facading.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-util-facading/src/main/java/org/apache/marmotta/commons/sesame/facading/api/Facading.java b/commons/marmotta-sesame-tools/marmotta-util-facading/src/main/java/org/apache/marmotta/commons/sesame/facading/api/Facading.java
index dc9334b..0dfd2e6 100644
--- a/commons/marmotta-sesame-tools/marmotta-util-facading/src/main/java/org/apache/marmotta/commons/sesame/facading/api/Facading.java
+++ b/commons/marmotta-sesame-tools/marmotta-util-facading/src/main/java/org/apache/marmotta/commons/sesame/facading/api/Facading.java
@@ -45,7 +45,7 @@ public interface Facading {
* @param type the facade type as a class
* @return
*/
- public <C extends Facade> C createFacade(Resource r, Class<C> type);
+ <C extends Facade> C createFacade(Resource r, Class<C> type);
/**
* Create an instance of C that facades the resource given as argument using the @RDF annotations provided
@@ -60,7 +60,7 @@ public interface Facading {
* @param context the context into which the facade should be put
* @return
*/
- public <C extends Facade> C createFacade(Resource r, Class<C> type, URI context);
+ <C extends Facade> C createFacade(Resource r, Class<C> type, URI context);
/**
* Create a collection of instances of C that facade the resources given in the collection passed as argument.
@@ -72,7 +72,7 @@ public interface Facading {
* @param type the facade type as a class
* @return
*/
- public <C extends Facade> Collection<C> createFacade(Collection<? extends Resource> list, Class<C> type);
+ <C extends Facade> Collection<C> createFacade(Collection<? extends Resource> list, Class<C> type);
/**
* Create an instance of C that facades the resource identified by the uri given as argument, using the @RDF
@@ -84,7 +84,7 @@ public interface Facading {
* @param <C> the facade type as a generic parameter
* @return
*/
- public <C extends Facade> C createFacade(String uri, Class<C> type);
+ <C extends Facade> C createFacade(String uri, Class<C> type);
/**
* Check whether the resource fits into the facade.
@@ -96,7 +96,7 @@ public interface Facading {
* @return <code>true</code> if the resource <code>r</code> fulfills all {@link org.apache.marmotta.commons.sesame.facading.annotations.RDFType} and
* {@link org.apache.marmotta.commons.sesame.facading.annotations.RDFFilter} requirements of <code>type</code>
*/
- public <C extends Facade> boolean isFacadeable(Resource r, Class<C> type, URI context);
+ <C extends Facade> boolean isFacadeable(Resource r, Class<C> type, URI context);
/**
* Check whether the resource fits into the facade.
@@ -107,7 +107,7 @@ public interface Facading {
* @return <code>true</code> if the resource <code>r</code> fulfills all {@link org.apache.marmotta.commons.sesame.facading.annotations.RDFType} and
* {@link org.apache.marmotta.commons.sesame.facading.annotations.RDFFilter} requirements of <code>type</code>
*/
- public <C extends Facade> boolean isFacadeable(Resource r, Class<C> type);
+ <C extends Facade> boolean isFacadeable(Resource r, Class<C> type);
/**
* Create a collection of instances of C that facade the resources given in the collection passed as argument.
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-util-facading/src/main/java/org/apache/marmotta/commons/sesame/facading/api/FacadingPredicateBuilder.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-util-facading/src/main/java/org/apache/marmotta/commons/sesame/facading/api/FacadingPredicateBuilder.java b/commons/marmotta-sesame-tools/marmotta-util-facading/src/main/java/org/apache/marmotta/commons/sesame/facading/api/FacadingPredicateBuilder.java
index bf29a4a..909ceb9 100644
--- a/commons/marmotta-sesame-tools/marmotta-util-facading/src/main/java/org/apache/marmotta/commons/sesame/facading/api/FacadingPredicateBuilder.java
+++ b/commons/marmotta-sesame-tools/marmotta-util-facading/src/main/java/org/apache/marmotta/commons/sesame/facading/api/FacadingPredicateBuilder.java
@@ -17,11 +17,11 @@
package org.apache.marmotta.commons.sesame.facading.api;
-import java.lang.reflect.Method;
-
import org.apache.marmotta.commons.sesame.facading.impl.FacadingPredicate;
import org.apache.marmotta.commons.sesame.facading.model.Facade;
+import java.lang.reflect.Method;
+
/**
* Dynamically create the RDF-property uri for facading.
* <p>
@@ -32,6 +32,6 @@ import org.apache.marmotta.commons.sesame.facading.model.Facade;
*/
public interface FacadingPredicateBuilder {
- public FacadingPredicate getFacadingPredicate(String fieldName, Class<? extends Facade> facade, Method method);
+ FacadingPredicate getFacadingPredicate(String fieldName, Class<? extends Facade> facade, Method method);
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-util-facading/src/main/java/org/apache/marmotta/commons/sesame/facading/impl/FacadingInvocationHandler.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-util-facading/src/main/java/org/apache/marmotta/commons/sesame/facading/impl/FacadingInvocationHandler.java b/commons/marmotta-sesame-tools/marmotta-util-facading/src/main/java/org/apache/marmotta/commons/sesame/facading/impl/FacadingInvocationHandler.java
index 52fd2e6..d6d29a5 100644
--- a/commons/marmotta-sesame-tools/marmotta-util-facading/src/main/java/org/apache/marmotta/commons/sesame/facading/impl/FacadingInvocationHandler.java
+++ b/commons/marmotta-sesame-tools/marmotta-util-facading/src/main/java/org/apache/marmotta/commons/sesame/facading/impl/FacadingInvocationHandler.java
@@ -47,7 +47,7 @@ import java.util.*;
*/
class FacadingInvocationHandler implements InvocationHandler {
- public static enum OPERATOR {
+ public enum OPERATOR {
GET(false, 0, "get"),
SET(true, 1, "set"),
ADD(true, 1, "add"),
@@ -59,9 +59,7 @@ class FacadingInvocationHandler implements InvocationHandler {
static {
LinkedList<String> ops = new LinkedList<String>();
for (OPERATOR op : OPERATOR.values()) {
- for (String px : op.prefixes) {
- ops.add(px);
- }
+ Collections.addAll(ops, op.prefixes);
}
PX = ops.toArray(new String[ops.size()]);
SPX = ops.toArray(new String[ops.size()]);
@@ -77,7 +75,7 @@ class FacadingInvocationHandler implements InvocationHandler {
final int numArgs;
final boolean writeOp;
- private OPERATOR(boolean isWriteOp, int args, String... strings) {
+ OPERATOR(boolean isWriteOp, int args, String... strings) {
this.writeOp = isWriteOp;
this.numArgs = args;
this.prefixes = strings;
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-util-facading/src/main/java/org/apache/marmotta/commons/sesame/facading/impl/FacadingInvocationHelper.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-util-facading/src/main/java/org/apache/marmotta/commons/sesame/facading/impl/FacadingInvocationHelper.java b/commons/marmotta-sesame-tools/marmotta-util-facading/src/main/java/org/apache/marmotta/commons/sesame/facading/impl/FacadingInvocationHelper.java
index 0bf9380..d4d443e 100644
--- a/commons/marmotta-sesame-tools/marmotta-util-facading/src/main/java/org/apache/marmotta/commons/sesame/facading/impl/FacadingInvocationHelper.java
+++ b/commons/marmotta-sesame-tools/marmotta-util-facading/src/main/java/org/apache/marmotta/commons/sesame/facading/impl/FacadingInvocationHelper.java
@@ -39,9 +39,8 @@ class FacadingInvocationHelper {
// Check # of arguments
final Class<?>[] pTypes = method.getParameterTypes();
- if (pTypes.length != argNum) { return false; }
+ return pTypes.length == argNum;
- return true;
}
static boolean checkMethodSig(Method method, String name, Class<?>... args) {
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-util-facading/src/main/java/org/apache/marmotta/commons/sesame/facading/model/Facade.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-util-facading/src/main/java/org/apache/marmotta/commons/sesame/facading/model/Facade.java b/commons/marmotta-sesame-tools/marmotta-util-facading/src/main/java/org/apache/marmotta/commons/sesame/facading/model/Facade.java
index 2884ee4..98fab64 100644
--- a/commons/marmotta-sesame-tools/marmotta-util-facading/src/main/java/org/apache/marmotta/commons/sesame/facading/model/Facade.java
+++ b/commons/marmotta-sesame-tools/marmotta-util-facading/src/main/java/org/apache/marmotta/commons/sesame/facading/model/Facade.java
@@ -36,5 +36,5 @@ public interface Facade {
*
* @return
*/
- public Resource getDelegate();
+ Resource getDelegate();
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-util-facading/src/main/java/org/apache/marmotta/commons/sesame/facading/util/FacadeUtils.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-util-facading/src/main/java/org/apache/marmotta/commons/sesame/facading/util/FacadeUtils.java b/commons/marmotta-sesame-tools/marmotta-util-facading/src/main/java/org/apache/marmotta/commons/sesame/facading/util/FacadeUtils.java
index f003e17..0ee82cc 100644
--- a/commons/marmotta-sesame-tools/marmotta-util-facading/src/main/java/org/apache/marmotta/commons/sesame/facading/util/FacadeUtils.java
+++ b/commons/marmotta-sesame-tools/marmotta-util-facading/src/main/java/org/apache/marmotta/commons/sesame/facading/util/FacadeUtils.java
@@ -216,11 +216,8 @@ public class FacadeUtils {
// even if the char is a primitive is not a number
final boolean isCharacter = Character.class.equals(clazz);
- if (isCharacter) {
- return true;
- }
+ return isCharacter;
- return false;
}
/**
@@ -258,11 +255,8 @@ public class FacadeUtils {
final Class<? super C> superClass = clazz.getSuperclass();
final boolean isNumber = Number.class.equals(superClass);
- if (isNumber) {
- return true;
- }
+ return isNumber;
- return false;
}
/**
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-util-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/SesameFilter.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-util-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/SesameFilter.java b/commons/marmotta-sesame-tools/marmotta-util-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/SesameFilter.java
index f7a2b5b..6eecef4 100644
--- a/commons/marmotta-sesame-tools/marmotta-util-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/SesameFilter.java
+++ b/commons/marmotta-sesame-tools/marmotta-util-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/SesameFilter.java
@@ -31,6 +31,6 @@ public interface SesameFilter<T> {
* @param object the object to check
* @return true in case the object is accepted, false otherwise
*/
- public boolean accept(T object);
+ boolean accept(T object);
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-util-rdfpatch/src/main/java/org/apache/marmotta/platform/ldp/patch/model/PatchLine.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-util-rdfpatch/src/main/java/org/apache/marmotta/platform/ldp/patch/model/PatchLine.java b/commons/marmotta-sesame-tools/marmotta-util-rdfpatch/src/main/java/org/apache/marmotta/platform/ldp/patch/model/PatchLine.java
index 026cbad..47ca460 100644
--- a/commons/marmotta-sesame-tools/marmotta-util-rdfpatch/src/main/java/org/apache/marmotta/platform/ldp/patch/model/PatchLine.java
+++ b/commons/marmotta-sesame-tools/marmotta-util-rdfpatch/src/main/java/org/apache/marmotta/platform/ldp/patch/model/PatchLine.java
@@ -18,7 +18,6 @@
package org.apache.marmotta.platform.ldp.patch.model;
import org.openrdf.model.Statement;
-import org.openrdf.model.vocabulary.RDFS;
/**
* A single PatchLine, i.e. a operation of a Patch.
@@ -31,7 +30,7 @@ public class PatchLine {
private final String cmd;
- private Operator(String cmd) {
+ Operator(String cmd) {
this.cmd = cmd;
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-util-rdfpatch/src/main/java/org/apache/marmotta/platform/ldp/patch/parser/RdfPatchParser.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-util-rdfpatch/src/main/java/org/apache/marmotta/platform/ldp/patch/parser/RdfPatchParser.java b/commons/marmotta-sesame-tools/marmotta-util-rdfpatch/src/main/java/org/apache/marmotta/platform/ldp/patch/parser/RdfPatchParser.java
index 4963b7b..e361dce 100644
--- a/commons/marmotta-sesame-tools/marmotta-util-rdfpatch/src/main/java/org/apache/marmotta/platform/ldp/patch/parser/RdfPatchParser.java
+++ b/commons/marmotta-sesame-tools/marmotta-util-rdfpatch/src/main/java/org/apache/marmotta/platform/ldp/patch/parser/RdfPatchParser.java
@@ -32,12 +32,12 @@ public interface RdfPatchParser {
/**
* Mime-Type: {@value}
*/
- public static final String MIME_TYPE = "application/rdf-patch";
+ String MIME_TYPE = "application/rdf-patch";
/**
* Default File extension for rdf-patch: {@value}
*/
- public static final String FILE_EXTENSION = "rdfp";
+ String FILE_EXTENSION = "rdfp";
void setValueFactory(ValueFactory vf);
@@ -48,5 +48,5 @@ public interface RdfPatchParser {
* @return a List of {@link org.apache.marmotta.platform.ldp.patch.model.PatchLine}s
* @throws ParseException if the patch could not be parsed.
*/
- public List<PatchLine> parsePatch() throws ParseException;
+ List<PatchLine> parsePatch() throws ParseException;
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-util-tripletable/src/main/java/org/apache/marmotta/commons/sesame/tripletable/TripleTable.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-util-tripletable/src/main/java/org/apache/marmotta/commons/sesame/tripletable/TripleTable.java b/commons/marmotta-sesame-tools/marmotta-util-tripletable/src/main/java/org/apache/marmotta/commons/sesame/tripletable/TripleTable.java
index 1d2d259..2897212 100644
--- a/commons/marmotta-sesame-tools/marmotta-util-tripletable/src/main/java/org/apache/marmotta/commons/sesame/tripletable/TripleTable.java
+++ b/commons/marmotta-sesame-tools/marmotta-util-tripletable/src/main/java/org/apache/marmotta/commons/sesame/tripletable/TripleTable.java
@@ -463,9 +463,8 @@ public class TripleTable<Triple extends Statement> implements Set<Triple>, Seria
@SuppressWarnings("rawtypes")
TripleTable that = (TripleTable) o;
- if (!data.equals(that.data)) return false;
+ return data.equals(that.data);
- return true;
}
@Override
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/engine/ReasoningEngine.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/engine/ReasoningEngine.java b/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/engine/ReasoningEngine.java
index ffbae98..db5a85c 100644
--- a/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/engine/ReasoningEngine.java
+++ b/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/engine/ReasoningEngine.java
@@ -198,8 +198,6 @@ public class ReasoningEngine implements TransactionListener {
} catch(Exception ex) {
log.error("error while processing rule",ex);
-
- return;
} finally {
endTask();
}
@@ -275,7 +273,7 @@ public class ReasoningEngine implements TransactionListener {
} catch (InterruptedException e) {
log.error("interrupted while waiting for reasoning queue to become available ...");
}
- };
+ }
}
@@ -478,8 +476,6 @@ public class ReasoningEngine implements TransactionListener {
//workers.invokeAll(tasks);
} catch(Exception ex) {
log.error("error while processing rules", ex);
-
- return;
}
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/program/Field.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/program/Field.java b/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/program/Field.java
index a9dea9e..3cfbf33 100644
--- a/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/program/Field.java
+++ b/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/program/Field.java
@@ -26,16 +26,16 @@ import java.util.Map;
*/
public interface Field {
- public boolean isResourceField();
+ boolean isResourceField();
- public boolean isLiteralField();
+ boolean isLiteralField();
- public boolean isVariableField();
+ boolean isVariableField();
/**
* Create string representation taking into account the namespace definitions given as argument.
* @param namespaces
* @return
*/
- public String toString(Map<String,String> namespaces);
+ String toString(Map<String, String> namespaces);
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/program/LiteralField.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/program/LiteralField.java b/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/program/LiteralField.java
index c3305ec..e2c184a 100644
--- a/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/program/LiteralField.java
+++ b/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/program/LiteralField.java
@@ -84,9 +84,8 @@ public class LiteralField implements Field {
LiteralField that = (LiteralField) o;
- if (literal != null ? !literal.equals(that.literal) : that.literal != null) return false;
+ return literal != null ? literal.equals(that.literal) : that.literal == null;
- return true;
}
@Override
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/program/Program.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/program/Program.java b/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/program/Program.java
index 31e736c..9659402 100644
--- a/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/program/Program.java
+++ b/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/program/Program.java
@@ -129,9 +129,8 @@ public class Program {
if (description != null ? !description.equals(program.description) : program.description != null) return false;
if (!name.equals(program.name)) return false;
if (!namespaces.equals(program.namespaces)) return false;
- if (!rules.equals(program.rules)) return false;
+ return rules.equals(program.rules);
- return true;
}
@Override
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/program/ResourceField.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/program/ResourceField.java b/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/program/ResourceField.java
index 540ea32..b221c7d 100644
--- a/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/program/ResourceField.java
+++ b/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/program/ResourceField.java
@@ -96,9 +96,8 @@ public class ResourceField implements Field {
ResourceField that = (ResourceField) o;
- if (resource != null ? !resource.equals(that.resource) : that.resource != null) return false;
+ return resource != null ? resource.equals(that.resource) : that.resource == null;
- return true;
}
@Override
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/program/VariableField.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/program/VariableField.java b/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/program/VariableField.java
index 57fdbd8..3711cbd 100644
--- a/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/program/VariableField.java
+++ b/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/program/VariableField.java
@@ -80,9 +80,8 @@ public class VariableField implements Field {
VariableField that = (VariableField) o;
- if (!name.equals(that.name)) return false;
+ return name.equals(that.name);
- return true;
}
@Override
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/query/QueryResultIterator.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/query/QueryResultIterator.java b/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/query/QueryResultIterator.java
index e897491..b9b2649 100644
--- a/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/query/QueryResultIterator.java
+++ b/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/query/QueryResultIterator.java
@@ -35,5 +35,5 @@ public interface QueryResultIterator extends CloseableIteration<QueryResult, SQL
/**
* Close the underlying result set and database connection.
*/
- public void close();
+ void close();
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/ValueConverter.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/ValueConverter.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/ValueConverter.java
index 91fa829..4745608 100644
--- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/ValueConverter.java
+++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/ValueConverter.java
@@ -29,5 +29,5 @@ import org.openrdf.model.Value;
public interface ValueConverter {
- public KiWiNode convert(Value value);
+ KiWiNode convert(Value value);
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/model/SQLFragment.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/model/SQLFragment.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/model/SQLFragment.java
index b76fdbc..13b80b8 100644
--- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/model/SQLFragment.java
+++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/model/SQLFragment.java
@@ -38,9 +38,9 @@ public class SQLFragment extends SQLClause {
* This distinction is necessary when OPTIONAL constructs are used, i.e. the created SQL uses LEFT JOINs. We cannot
* always place it in JOIN conditions, because the first pattern will not have a JOIN.
*/
- public static enum ConditionPosition {
+ public enum ConditionPosition {
JOIN, WHERE, HAVING
- };
+ }
private static Random singletonSetGenerator = new Random();
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/model/SQLPattern.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/model/SQLPattern.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/model/SQLPattern.java
index 82ed0f9..fc84ade 100644
--- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/model/SQLPattern.java
+++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/model/SQLPattern.java
@@ -37,7 +37,7 @@ public class SQLPattern extends SQLClause {
/**
* Describe the different columns of the triple table that we might need to join with
*/
- public static enum TripleColumns {
+ public enum TripleColumns {
SUBJECT ("subject"),
PREDICATE("predicate"),
OBJECT ("object"),
@@ -52,7 +52,7 @@ public class SQLPattern extends SQLClause {
public String getFieldName() {
return fieldName;
}
- };
+ }
/**
* This map contains mappings from column to variable names. If for a given column an entry is contained in the
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/model/SQLVariable.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/model/SQLVariable.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/model/SQLVariable.java
index f187e1e..aab5c3b 100644
--- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/model/SQLVariable.java
+++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/model/SQLVariable.java
@@ -156,9 +156,8 @@ public class SQLVariable implements Cloneable{
SQLVariable that = (SQLVariable) o;
- if (!sparqlName.equals(that.sparqlName)) return false;
+ return sparqlName.equals(that.sparqlName);
- return true;
}
@Override
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/NativeFunction.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/NativeFunction.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/NativeFunction.java
index 76db249..2bd76a2 100644
--- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/NativeFunction.java
+++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/NativeFunction.java
@@ -37,7 +37,7 @@ public interface NativeFunction extends Function {
* @param dialect
* @return
*/
- public boolean isSupported(KiWiDialect dialect);
+ boolean isSupported(KiWiDialect dialect);
/**
* Return a string representing how this function is translated into SQL in the given dialect
@@ -45,13 +45,13 @@ public interface NativeFunction extends Function {
* @param args
* @return
*/
- public String getNative(KiWiDialect dialect, String... args);
+ String getNative(KiWiDialect dialect, String... args);
/**
* Get the return type of the function. This is needed for SQL type casting inside KiWi.
* @return
*/
- public ValueType getReturnType();
+ ValueType getReturnType();
/**
* Get the argument type of the function for the arg'th argument (starting to count at 0).
@@ -60,18 +60,18 @@ public interface NativeFunction extends Function {
* @param arg
* @return
*/
- public ValueType getArgumentType(int arg);
+ ValueType getArgumentType(int arg);
/**
* Return the minimum number of arguments this function requires.
* @return
*/
- public int getMinArgs();
+ int getMinArgs();
/**
* Return the maximum number of arguments this function can take
*
* @return
*/
- public int getMaxArgs();
+ int getMaxArgs();
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/optimizer/DistinctLimitOptimizer.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/optimizer/DistinctLimitOptimizer.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/optimizer/DistinctLimitOptimizer.java
index f5e8d8f..10a054b 100644
--- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/optimizer/DistinctLimitOptimizer.java
+++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/optimizer/DistinctLimitOptimizer.java
@@ -142,11 +142,7 @@ public class DistinctLimitOptimizer implements QueryOptimizer {
return true;
} else if(expr instanceof Order) {
return true;
- } else if(expr instanceof Group) {
- return true;
- } else {
- return false;
- }
+ } else return expr instanceof Group;
}
}
@@ -190,11 +186,7 @@ public class DistinctLimitOptimizer implements QueryOptimizer {
return true;
} else if(expr instanceof Group) {
return true;
- } else if(expr instanceof Slice) {
- return true;
- } else {
- return false;
- }
+ } else return expr instanceof Slice;
}
}
@@ -242,11 +234,7 @@ public class DistinctLimitOptimizer implements QueryOptimizer {
return true;
} else if(expr instanceof Distinct) {
return true;
- } else if(expr instanceof Reduced) {
- return true;
- } else {
- return false;
- }
+ } else return expr instanceof Reduced;
}
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/caching/CacheManagerFactory.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/caching/CacheManagerFactory.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/caching/CacheManagerFactory.java
index 3a33e05..29e16e6 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/caching/CacheManagerFactory.java
+++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/caching/CacheManagerFactory.java
@@ -32,6 +32,6 @@ public interface CacheManagerFactory {
* @param configuration KiWi configuration used by the underlying triple store
* @return a new cache manager instance for this triple store
*/
- public CacheManager createCacheManager(KiWiConfiguration configuration);
+ CacheManager createCacheManager(KiWiConfiguration configuration);
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java
index f88bd14..79d9934 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java
+++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java
@@ -2457,7 +2457,7 @@ public class KiWiConnection implements AutoCloseable {
protected interface RetryCommand<T> {
- public T run() throws SQLException;
+ T run() throws SQLException;
}
/**
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/mysql/MySQLDialect.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/mysql/MySQLDialect.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/mysql/MySQLDialect.java
index 77d5aaa..503ed35 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/mysql/MySQLDialect.java
+++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/mysql/MySQLDialect.java
@@ -85,11 +85,8 @@ public class MySQLDialect extends KiWiDialect {
if(StringUtils.containsIgnoreCase(flags,"m")) {
return false;
}
- if(StringUtils.containsIgnoreCase(flags,"x")) {
- return false;
- }
+ return !StringUtils.containsIgnoreCase(flags, "x");
- return true;
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/registry/LocalTripleRegistry.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/registry/LocalTripleRegistry.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/registry/LocalTripleRegistry.java
index 762a179..a15e0d7 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/registry/LocalTripleRegistry.java
+++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/registry/LocalTripleRegistry.java
@@ -33,17 +33,14 @@ public class LocalTripleRegistry implements KiWiTripleRegistry {
private Map<Long,Long> cache;
-
private Map<Long,List<Long>> transactions;
-
public LocalTripleRegistry() {
cache = new ConcurrentHashMap<>();
transactions = new ConcurrentHashMap<>();
}
-
/**
* Register a key/triple id pair in the triple registry for the given transaction ID.
*
@@ -74,9 +71,9 @@ public class LocalTripleRegistry implements KiWiTripleRegistry {
Long value = cache.get(key.longHashCode());
if(value != null) {
return value;
- } else {
- return -1;
}
+
+ return -1;
}
/**
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/util/ResultTransformerFunction.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/util/ResultTransformerFunction.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/util/ResultTransformerFunction.java
index 28f31f1..0b83f07 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/util/ResultTransformerFunction.java
+++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/util/ResultTransformerFunction.java
@@ -34,6 +34,6 @@ public interface ResultTransformerFunction<E> {
* @return an entity of type E constructed from the result row
* @throws SQLException if a database error occurs when transforming the row
*/
- public E apply(ResultSet row) throws SQLException;
+ E apply(ResultSet row) throws SQLException;
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/sail/KiWiSailConnection.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/sail/KiWiSailConnection.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/sail/KiWiSailConnection.java
index 6a700ea..ecedf09 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/sail/KiWiSailConnection.java
+++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/sail/KiWiSailConnection.java
@@ -294,7 +294,7 @@ public class KiWiSailConnection extends NotifyingSailConnectionBase implements I
}
- return new UnionIteration<Statement, SailException>(
+ return new UnionIteration<>(
Iterables.transform(iterations, new Function<DelayedIteration<Statement, RepositoryException>, Iteration<? extends Statement, SailException>>() {
@Override
public Iteration<? extends Statement, SailException> apply(DelayedIteration<Statement, RepositoryException> input) {
@@ -318,13 +318,13 @@ public class KiWiSailConnection extends NotifyingSailConnectionBase implements I
try {
if(contexts.length == 0) {
return databaseConnection.getSize();
- } else {
- long sum = 0;
- for(Resource context : contexts) {
- sum += databaseConnection.getSize(valueFactory.convert(context));
- }
- return sum;
}
+
+ long sum = 0;
+ for(Resource context : contexts) {
+ sum += databaseConnection.getSize(valueFactory.convert(context));
+ }
+ return sum;
} catch(SQLException ex) {
throw new SailException("database error while listing triples",ex);
}
@@ -509,9 +509,8 @@ public class KiWiSailConnection extends NotifyingSailConnectionBase implements I
KiWiNamespace result = databaseConnection.loadNamespaceByPrefix(prefix);
if(result != null) {
return result.getUri();
- } else {
- return null;
}
+ return null;
} catch (SQLException e) {
throw new SailException("database error while querying namespaces",e);
}
@@ -561,9 +560,8 @@ public class KiWiSailConnection extends NotifyingSailConnectionBase implements I
if(defaultContext != null) {
// null value for context means statements without context; in KiWi, this means "default context"
return (KiWiUriResource)valueFactory.createURI(defaultContext);
- } else {
- return null;
}
+ return null;
} else {
return valueFactory.convert(input);
}
@@ -611,25 +609,22 @@ public class KiWiSailConnection extends NotifyingSailConnectionBase implements I
if (e instanceof ClosedByInterruptException) {
return new QueryInterruptedException(e);
}
- else if (e instanceof IOException) {
+ if (e instanceof IOException) {
return new QueryEvaluationException(e);
}
- else if (e instanceof SailException) {
+ if (e instanceof SailException) {
if(e.getCause() instanceof ResultInterruptedException) {
return new QueryInterruptedException(e);
- } else {
- return new QueryEvaluationException(e);
}
+ return new QueryEvaluationException(e);
}
- else if (e instanceof RuntimeException) {
+ if (e instanceof RuntimeException) {
throw (RuntimeException)e;
}
- else if (e == null) {
+ if (e == null) {
throw new IllegalArgumentException("e must not be null");
}
- else {
- throw new IllegalArgumentException("Unexpected exception type: " + e.getClass(),e);
- }
+ throw new IllegalArgumentException("Unexpected exception type: " + e.getClass(),e);
}
};
} catch (SailException ex) {
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/sail/KiWiValueFactory.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/sail/KiWiValueFactory.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/sail/KiWiValueFactory.java
index 3a717a2..dda62a7 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/sail/KiWiValueFactory.java
+++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/sail/KiWiValueFactory.java
@@ -223,9 +223,8 @@ public class KiWiValueFactory implements ValueFactory {
public Literal createLiteral(Object object) {
if(object instanceof XMLGregorianCalendar) {
return createLiteral((XMLGregorianCalendar)object);
- } else {
- return createLiteral(object,null,LiteralCommons.getXSDType(object.getClass()));
}
+ return createLiteral(object,null,LiteralCommons.getXSDType(object.getClass()));
}
/**
@@ -309,7 +308,9 @@ public class KiWiValueFactory implements ValueFactory {
if(result == null) {
result = new KiWiStringLiteral(value.toString(), locale, rtype);
}
- } else if(value instanceof Date || value instanceof DateTime ||type.equals(Namespaces.NS_XSD+"dateTime") || type.equals(Namespaces.NS_XSD+"date") || type.equals(Namespaces.NS_XSD+"time")) {
+ } else if(value instanceof Date || value instanceof DateTime ||
+ type.equals(Namespaces.NS_XSD+"dateTime") || type.equals(Namespaces.NS_XSD+"date") ||
+ type.equals(Namespaces.NS_XSD+"time")) {
// parse if necessary
final DateTime dvalue;
if(value instanceof DateTime) {
@@ -644,19 +645,22 @@ public class KiWiValueFactory implements ValueFactory {
public KiWiNode convert(Value value) {
if(value == null) {
return null;
- } else if(value instanceof KiWiNode) {
+ }
+ if(value instanceof KiWiNode) {
return (KiWiNode)value;
- } else if(value instanceof URI) {
+ }
+ if(value instanceof URI) {
return (KiWiUriResource)createURI(value.stringValue());
- } else if(value instanceof BNode) {
+ }
+ if(value instanceof BNode) {
return (KiWiAnonResource)createBNode(value.stringValue());
- } else if(value instanceof Literal) {
+ }
+ if(value instanceof Literal) {
Literal l = (Literal)value;
return createLiteral(l.getLabel(),l.getLanguage(), l.getDatatype() != null ? l.getDatatype().stringValue(): null);
- } else {
- throw new IllegalArgumentException("the value passed as argument does not have the correct type");
}
+ throw new IllegalArgumentException("the value passed as argument does not have the correct type");
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/api/VersioningSail.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/api/VersioningSail.java b/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/api/VersioningSail.java
index 11a88fb..709c1a3 100644
--- a/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/api/VersioningSail.java
+++ b/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/api/VersioningSail.java
@@ -40,14 +40,14 @@ public interface VersioningSail extends TransactionalSail {
*
* @return
*/
- public RepositoryResult<Version> listVersions() throws SailException;
+ RepositoryResult<Version> listVersions() throws SailException;
/**
* List all versions of this repository between a start and end date.
*
* @return
*/
- public RepositoryResult<Version> listVersions(Date from, Date to) throws SailException;
+ RepositoryResult<Version> listVersions(Date from, Date to) throws SailException;
/**
@@ -60,7 +60,7 @@ public interface VersioningSail extends TransactionalSail {
* (or not deleted at all).
* @return a read-only sail connection to access the data of the triple store at the given date
*/
- public SailConnection getSnapshot(Date snapshotDate) throws SailException;
+ SailConnection getSnapshot(Date snapshotDate) throws SailException;
/**
* List all versions of this repository affecting the given resource as subject.
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/libraries/ldcache/ldcache-api/src/main/java/org/apache/marmotta/ldcache/api/LDCachingBackend.java
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-api/src/main/java/org/apache/marmotta/ldcache/api/LDCachingBackend.java b/libraries/ldcache/ldcache-api/src/main/java/org/apache/marmotta/ldcache/api/LDCachingBackend.java
index 34a2028..4da2729 100644
--- a/libraries/ldcache/ldcache-api/src/main/java/org/apache/marmotta/ldcache/api/LDCachingBackend.java
+++ b/libraries/ldcache/ldcache-api/src/main/java/org/apache/marmotta/ldcache/api/LDCachingBackend.java
@@ -35,7 +35,7 @@ public interface LDCachingBackend {
* @param resource the resource to retrieve the cache entry for
* @return
*/
- public CacheEntry getEntry(URI resource);
+ CacheEntry getEntry(URI resource);
/**
@@ -44,7 +44,7 @@ public interface LDCachingBackend {
* @param resource the resource to update
* @param entry the entry for the resource
*/
- public void putEntry(URI resource, CacheEntry entry);
+ void putEntry(URI resource, CacheEntry entry);
/**
@@ -52,24 +52,24 @@ public interface LDCachingBackend {
*
* @param resource the resource to remove the entry for
*/
- public void removeEntry(URI resource);
+ void removeEntry(URI resource);
/**
* Clear all entries in the cache backend.
*/
- public void clear();
+ void clear();
/**
* Carry out any initialization tasks that might be necessary
*/
- public void initialize();
+ void initialize();
/**
* Shutdown the backend and free all runtime resources.
*/
- public void shutdown();
+ void shutdown();
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/libraries/ldcache/ldcache-api/src/main/java/org/apache/marmotta/ldcache/api/LDCachingConnection.java
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-api/src/main/java/org/apache/marmotta/ldcache/api/LDCachingConnection.java b/libraries/ldcache/ldcache-api/src/main/java/org/apache/marmotta/ldcache/api/LDCachingConnection.java
index 2cbd619..c3b8f30 100644
--- a/libraries/ldcache/ldcache-api/src/main/java/org/apache/marmotta/ldcache/api/LDCachingConnection.java
+++ b/libraries/ldcache/ldcache-api/src/main/java/org/apache/marmotta/ldcache/api/LDCachingConnection.java
@@ -37,7 +37,7 @@ public interface LDCachingConnection extends RepositoryConnection {
* @param resource the resource to look for
* @return the cache entry for the resource, or null if the resource has never been cached or is expired
*/
- public CacheEntry getCacheEntry(URI resource) throws RepositoryException;
+ CacheEntry getCacheEntry(URI resource) throws RepositoryException;
/**
* Store a cache entry for the passed resource in the backend. Depending on the backend, this can be a
@@ -46,14 +46,14 @@ public interface LDCachingConnection extends RepositoryConnection {
* @param resource
* @param entry
*/
- public void addCacheEntry(URI resource, CacheEntry entry) throws RepositoryException;
+ void addCacheEntry(URI resource, CacheEntry entry) throws RepositoryException;
/**
* Remove the currently stored cache entry for the passed resource from the backend.
* @param resource
*/
- public void removeCacheEntry(URI resource) throws RepositoryException;
+ void removeCacheEntry(URI resource) throws RepositoryException;
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/libraries/ldcache/ldcache-api/src/main/java/org/apache/marmotta/ldcache/api/LDCachingService.java
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-api/src/main/java/org/apache/marmotta/ldcache/api/LDCachingService.java b/libraries/ldcache/ldcache-api/src/main/java/org/apache/marmotta/ldcache/api/LDCachingService.java
index 82c2df7..48e14bb 100644
--- a/libraries/ldcache/ldcache-api/src/main/java/org/apache/marmotta/ldcache/api/LDCachingService.java
+++ b/libraries/ldcache/ldcache-api/src/main/java/org/apache/marmotta/ldcache/api/LDCachingService.java
@@ -37,7 +37,7 @@ public interface LDCachingService {
* @param resource the resource to refresh
* @param options options for refreshing
*/
- public void refresh(URI resource, RefreshOpts... options);
+ void refresh(URI resource, RefreshOpts... options);
/**
@@ -49,7 +49,7 @@ public interface LDCachingService {
* @param options options for refreshing
* @return a Sesame Model holding the triples representing the resource
*/
- public Model get(URI resource, RefreshOpts... options);
+ Model get(URI resource, RefreshOpts... options);
/**
@@ -58,7 +58,7 @@ public interface LDCachingService {
*
* @param resource the resource to expire.
*/
- public void expire(URI resource);
+ void expire(URI resource);
/**
@@ -67,22 +67,22 @@ public interface LDCachingService {
* @param resource the resource to check
* @return true in case the resource is contained in the cache
*/
- public boolean contains(URI resource);
+ boolean contains(URI resource);
/**
* Manually expire all cached resources.
*/
- public void clear();
+ void clear();
/**
* Shutdown the caching service and free all occupied runtime resources.
*/
- public void shutdown();
+ void shutdown();
- public enum RefreshOpts {
+ enum RefreshOpts {
/**
* Refresh the resource even if it is not yet expired
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/LDPathConstruct.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/LDPathConstruct.java b/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/LDPathConstruct.java
index 36f8390..5652122 100644
--- a/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/LDPathConstruct.java
+++ b/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/LDPathConstruct.java
@@ -31,6 +31,6 @@ public interface LDPathConstruct<Node> {
* @return
* @param backend
*/
- public String getPathExpression(NodeBackend<Node> backend);
+ String getPathExpression(NodeBackend<Node> backend);
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/backend/NodeBackend.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/backend/NodeBackend.java b/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/backend/NodeBackend.java
index 471eb71..01d94c0 100644
--- a/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/backend/NodeBackend.java
+++ b/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/backend/NodeBackend.java
@@ -33,21 +33,21 @@ public interface NodeBackend<Node> {
* @param n the node to check
* @return true if the node is a literal
*/
- public boolean isLiteral(Node n);
+ boolean isLiteral(Node n);
/**
* Test whether the node passed as argument is a URI
* @param n the node to check
* @return true if the node is a URI
*/
- public boolean isURI(Node n);
+ boolean isURI(Node n);
/**
* Test whether the node passed as argument is a blank node
* @param n the node to check
* @return true if the node is a blank node
*/
- public boolean isBlank(Node n);
+ boolean isBlank(Node n);
/**
* Return the language of the literal node passed as argument.
@@ -56,7 +56,7 @@ public interface NodeBackend<Node> {
* @return a Locale representing the language of the literal, or null if the literal node has no language
* @throws IllegalArgumentException in case the node is no literal
*/
- public Locale getLiteralLanguage(Node n);
+ Locale getLiteralLanguage(Node n);
/**
* Return the URI of the type of the literal node passed as argument.
@@ -65,28 +65,28 @@ public interface NodeBackend<Node> {
* @return a URI representing the type of the literal content, or null if the literal is untyped
* @throws IllegalArgumentException in case the node is no literal
*/
- public URI getLiteralType(Node n);
+ URI getLiteralType(Node n);
/**
* Create a literal node with the content passed as argument
* @param content string content to represent inside the literal
* @return a literal node in using the model used by this backend
*/
- public Node createLiteral(String content);
+ Node createLiteral(String content);
/**
* Create a literal node with the content passed as argument
* @param content string content to represent inside the literal
* @return a literal node in using the model used by this backend
*/
- public Node createLiteral(String content, Locale language, URI type);
+ Node createLiteral(String content, Locale language, URI type);
/**
* Create a URI mode with the URI passed as argument
* @param uri URI of the resource to create
* @return a URI node using the model used by this backend
*/
- public Node createURI(String uri);
+ Node createURI(String uri);
/**
* Return the lexial representation of a node. For a literal, this will be the content, for a URI node it will be the
@@ -94,7 +94,7 @@ public interface NodeBackend<Node> {
* @param node
* @return
*/
- public String stringValue(Node node);
+ String stringValue(Node node);
/**
* Return the double value of a literal node. Depending on the backend implementing this method,
@@ -108,7 +108,7 @@ public interface NodeBackend<Node> {
* @throws ArithmeticException in case the literal cannot be represented as double value
* @throws IllegalArgumentException in case the node passed as argument is not a literal
*/
- public Double doubleValue(Node node);
+ Double doubleValue(Node node);
/**
* Return the long value of a literal node. Depending on the backend implementing this method,
@@ -122,7 +122,7 @@ public interface NodeBackend<Node> {
* @throws ArithmeticException in case the literal cannot be represented as long value
* @throws IllegalArgumentException in case the node passed as argument is not a literal
*/
- public Long longValue(Node node);
+ Long longValue(Node node);
/**
* Return the boolean value of a literal node. Depending on the backend implementing this method,
@@ -137,7 +137,7 @@ public interface NodeBackend<Node> {
* @return long value of the literal node
* @throws IllegalArgumentException in case the node passed as argument is not a literal
*/
- public Boolean booleanValue(Node node);
+ Boolean booleanValue(Node node);
/**
* TODO
@@ -145,7 +145,7 @@ public interface NodeBackend<Node> {
* @return long value of the literal node
* @throws IllegalArgumentException in case the node passed as argument is not a literal
*/
- public Date dateTimeValue(Node node);
+ Date dateTimeValue(Node node);
/**
* TODO
@@ -153,7 +153,7 @@ public interface NodeBackend<Node> {
* @return long value of the literal node
* @throws IllegalArgumentException in case the node passed as argument is not a literal
*/
- public Date dateValue(Node node);
+ Date dateValue(Node node);
/**
* TODO
@@ -161,7 +161,7 @@ public interface NodeBackend<Node> {
* @return long value of the literal node
* @throws IllegalArgumentException in case the node passed as argument is not a literal
*/
- public Date timeValue(Node node);
+ Date timeValue(Node node);
/**
* Return the float value of a literal node. Depending on the backend implementing this method,
@@ -175,7 +175,7 @@ public interface NodeBackend<Node> {
* @throws ArithmeticException in case the literal cannot be represented as float value
* @throws IllegalArgumentException in case the node passed as argument is not a literal
*/
- public Float floatValue(Node node);
+ Float floatValue(Node node);
/**
* Return the 32bit integer value of a literal node. Depending on the backend implementing this method,
@@ -193,7 +193,7 @@ public interface NodeBackend<Node> {
* @throws ArithmeticException in case the literal cannot be represented as 32 bit integer value
* @throws IllegalArgumentException in case the node passed as argument is not a literal
*/
- public Integer intValue(Node node);
+ Integer intValue(Node node);
/**
* Return the arbitrary length integer value of a literal node. Depending on the backend implementing this method,
@@ -207,7 +207,7 @@ public interface NodeBackend<Node> {
* @throws ArithmeticException in case the literal cannot be represented as long value
* @throws IllegalArgumentException in case the node passed as argument is integer a literal
*/
- public BigInteger integerValue(Node node);
+ BigInteger integerValue(Node node);
/**
* Return the decimal number of a literal node. Depending on the backend implementing this method,
@@ -221,6 +221,6 @@ public interface NodeBackend<Node> {
* @throws ArithmeticException in case the literal cannot be represented as decimal value
* @throws IllegalArgumentException in case the node passed as argument is not a literal
*/
- public BigDecimal decimalValue(Node node);
+ BigDecimal decimalValue(Node node);
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/backend/RDFBackend.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/backend/RDFBackend.java b/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/backend/RDFBackend.java
index 49f649b..450befe 100644
--- a/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/backend/RDFBackend.java
+++ b/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/backend/RDFBackend.java
@@ -33,13 +33,13 @@ public interface RDFBackend<Node> extends NodeBackend<Node> {
* @deprecated subject to be removed in the next release
*/
@Deprecated
- public boolean supportsThreading();
+ boolean supportsThreading();
/**
* @deprecated subject to be removed in the next release
*/
@Deprecated
- public ThreadPoolExecutor getThreadPool();
+ ThreadPoolExecutor getThreadPool();
/**
@@ -50,7 +50,7 @@ public interface RDFBackend<Node> extends NodeBackend<Node> {
* @param property the property of the triples to look for, <code>null</code> is interpreted as wildcard
* @return all objects of triples with matching subject and property
*/
- public Collection<Node> listObjects(Node subject, Node property);
+ Collection<Node> listObjects(Node subject, Node property);
/**
@@ -62,6 +62,6 @@ public interface RDFBackend<Node> extends NodeBackend<Node> {
* @return all subjects of triples with matching object and property
* @throws UnsupportedOperationException in case reverse selection is not supported (e.g. when querying Linked Data)
*/
- public Collection<Node> listSubjects(Node property, Node object);
+ Collection<Node> listSubjects(Node property, Node object);
}