Merge pull request #10 from dvcama/dbpedia-redirection

"pubby style" redirection

Author: dvcama

src/main/java/org/dvcama/lodview/conf/ConfigurationBean.java

@@ -23,7 +23,7 @@ public class ConfigurationBean implements ServletContextAware, Cloneable {
 
 	private Model confModel = null;
 	private ServletContext context;
-	private String confFile, forceIriEncoding, homeUrl, license, httpRedirectSuffix, EndPointUrl, IRInamespace, contentEncoding, staticResourceURL, preferredLanguage, publicUrlPrefix = null, publicUrlSuffix = "", authUsername = null, authPassword = null, defaultInverseBehaviour = "collapse";
+	private String confFile, endPointType, redirectionStrategy, forceIriEncoding, httpRedirectExcludeList, homeUrl, license, httpRedirectSuffix, httpRedirectPrefix, endPointUrl, IRInamespace, contentEncoding, staticResourceURL, preferredLanguage, publicUrlPrefix = null, publicUrlSuffix = "", authUsername = null, authPassword = null, defaultInverseBehaviour = "collapse";
 
 	private List<String> defaultQueries = null, defaultRawDataQueries = null, defaultInversesQueries = null, defaultInversesTest = null, defaultInversesCountQueries = null, typeProperties = null, audioProperties = null, imageProperties = null, videoProperties = null, linkingProperties = null, titleProperties = null, descriptionProperties = null, longitudeProperties = null, latitudeProperties = null;
 	private List<String> colorPair = null, skipDomains = null, mainOntologiesPrefixes = null;
@@ -46,14 +46,18 @@ public void populateBean() throws IOException, Exception {
 		}
 		confModel = RDFDataMgr.loadModel(configFile.getAbsolutePath());
 
-		EndPointUrl = getSingleConfValue("endpoint");
+		endPointUrl = getSingleConfValue("endpoint");
+		endPointType = getSingleConfValue("endpointType", "");
 		authPassword = getSingleConfValue("authPassword");
 		authUsername = getSingleConfValue("authUsername");
 		forceIriEncoding = getSingleConfValue("forceIriEncoding", "auto");
+		redirectionStrategy = getSingleConfValue("redirectionStrategy", "");
 
 		IRInamespace = getSingleConfValue("IRInamespace", "<not provided>");
 
 		httpRedirectSuffix = getSingleConfValue("httpRedirectSuffix", "");
+		httpRedirectPrefix = getSingleConfValue("httpRedirectPrefix", "");
+		httpRedirectExcludeList = getSingleConfValue("httpRedirectExcludeList", "");
 
 		publicUrlPrefix = getSingleConfValue("publicUrlPrefix", "");
 		publicUrlPrefix = publicUrlPrefix.replaceAll(".+/auto$", context.getContextPath() + "/");
@@ -77,6 +81,7 @@ public void populateBean() throws IOException, Exception {
 
 		defaultQueries = getMultiConfValue("defaultQueries");
 		defaultRawDataQueries = getMultiConfValue("defaultRawDataQueries");
+
 		defaultInversesQueries = getMultiConfValue("defaultInversesQueries");
 		defaultInversesTest = getMultiConfValue("defaultInversesTest");
 		defaultInversesCountQueries = getMultiConfValue("defaultInversesCountQueries");
@@ -133,10 +138,6 @@ private List<String> getMultiConfValue(String prop) {
 		return result;
 	}
 
-	public void setConfFile(String confFile) {
-		this.confFile = confFile;
-	}
-
 	@Override
 	public void setServletContext(ServletContext arg0) {
 		this.context = arg0;
@@ -156,6 +157,14 @@ public Map<String, String> getPrefixes() {
 		return confModel.getNsPrefixMap();
 	}
 
+	public String getRedirectionStrategy() {
+		return redirectionStrategy;
+	}
+
+	public String getPreferredLanguage() {
+		return preferredLanguage;
+	}
+
 	public String getNsPrefixURI(String prefix) {
 		return confModel.getNsPrefixURI(prefix);
 	}
@@ -165,15 +174,7 @@ public String getNsURIPrefix(String IRI) {
 	}
 
 	public String getEndPointUrl() {
-		return EndPointUrl;
-	}
-
-	public void setEndPointUrl(String EndPointUrl) {
-		this.EndPointUrl = EndPointUrl;
-	}
-
-	public void setIRInamespace(String IRInamespace) {
-		this.IRInamespace = IRInamespace;
+		return endPointUrl;
 	}
 
 	public List<String> getDefaultQueries() {
@@ -196,14 +197,6 @@ public String getPublicUrlSuffix() {
 		return publicUrlSuffix;
 	}
 
-	public void setPublicUrlPrefix(String publicUrlPrefix) {
-		this.publicUrlPrefix = publicUrlPrefix;
-	}
-
-	public void setPublicUrlSuffix(String publicUrlSuffix) {
-		this.publicUrlSuffix = publicUrlSuffix;
-	}
-
 	public List<String> getDefaultRawDataQueries() {
 		return defaultRawDataQueries;
 	}
@@ -260,10 +253,6 @@ public List<String> getLinkingProperties() {
 		return linkingProperties;
 	}
 
-	public String getPreferredLanguage() {
-		return preferredLanguage;
-	}
-
 	public String getLicense() {
 		return license;
 	}
@@ -277,42 +266,22 @@ public String getRandomColorPair() {
 		return colorPair.get(randomNum);
 	}
 
-	public void setColorPair(List<String> colorPair) {
-		this.colorPair = colorPair;
-	}
-
 	public List<String> getSkipDomains() {
 		return skipDomains;
 	}
 
-	public void setSkipDomains(List<String> skipDomains) {
-		this.skipDomains = skipDomains;
-	}
-
 	public String getAuthPassword() {
 		return authPassword;
 	}
 
-	public void setAuthPassword(String authPassword) {
-		this.authPassword = authPassword;
-	}
-
 	public String getAuthUsername() {
 		return authUsername;
 	}
 
-	public void setAuthUsername(String authUsername) {
-		this.authUsername = authUsername;
-	}
-
 	public String getDefaultInverseBehaviour() {
 		return defaultInverseBehaviour;
 	}
 
-	public void setDefaultInverseBehaviour(String defaultInverseBehaviour) {
-		this.defaultInverseBehaviour = defaultInverseBehaviour;
-	}
-
 	public Map<String, String> getColorPairMatcher() {
 		return colorPairMatcher;
 	}
@@ -328,40 +297,40 @@ public Object clone() {
 
 	@Override
 	public String toString() {
-		return "ConfigurationBean [confModel=" + confModel + ", context=" + context + ", confFile=" + confFile + ", EndPointUrl=" + EndPointUrl + ", IRInamespace=" + IRInamespace + ", contentEncoding=" + contentEncoding + ", staticResourceURL=" + staticResourceURL + ", preferredLanguage=" + preferredLanguage + ", publicUrlPrefix=" + publicUrlPrefix + ", authUsername=" + authUsername + ", authPassword=" + authPassword + ", defaultInverseBehaviour=" + defaultInverseBehaviour + ", defaultQueries=" + defaultQueries + ", defaultRawDataQueries=" + defaultRawDataQueries + ", defaultInversesQueries=" + defaultInversesQueries + ", defaultInversesTest=" + defaultInversesTest + ", defaultInversesCountQueries=" + defaultInversesCountQueries + ", typeProperties=" + typeProperties
+		return "ConfigurationBean [confModel=" + confModel + ", context=" + context + ", confFile=" + confFile + ", endPointUrl=" + endPointUrl + ", IRInamespace=" + IRInamespace + ", contentEncoding=" + contentEncoding + ", staticResourceURL=" + staticResourceURL + ", preferredLanguage=" + preferredLanguage + ", publicUrlPrefix=" + publicUrlPrefix + ", authUsername=" + authUsername + ", authPassword=" + authPassword + ", defaultInverseBehaviour=" + defaultInverseBehaviour + ", defaultQueries=" + defaultQueries + ", defaultRawDataQueries=" + defaultRawDataQueries + ", defaultInversesQueries=" + defaultInversesQueries + ", defaultInversesTest=" + defaultInversesTest + ", defaultInversesCountQueries=" + defaultInversesCountQueries + ", typeProperties=" + typeProperties
 				+ ", imageProperties=" + imageProperties + ", audioProperties=" + audioProperties + ", videoProperties=" + videoProperties + ", linkingProperties=" + linkingProperties + ", titleProperties=" + titleProperties + ", descriptionProperties=" + descriptionProperties + ", longitudeProperties=" + longitudeProperties + ", latitudeProperties=" + latitudeProperties + ", colorPair=" + colorPair + ", skipDomains=" + skipDomains + ", rand=" + rand + "]";
 	}
 
 	public String getHomeUrl() {
 		return homeUrl;
 	}
 
-	public void setHomeUrl(String homeUrl) {
-		this.homeUrl = homeUrl;
-	}
-
 	public String getHttpRedirectSuffix() {
 		return httpRedirectSuffix;
 	}
 
-	public void setHttpRedirectSuffix(String httpRedirectSuffix) {
-		this.httpRedirectSuffix = httpRedirectSuffix;
+	public String getHttpRedirectPrefix() {
+		return httpRedirectPrefix;
 	}
 
-	public List<String> getMainOntologiesPrefixes() {
-		return mainOntologiesPrefixes;
+	public String getHttpRedirectExcludeList() {
+		return httpRedirectExcludeList;
 	}
 
-	public void setMainOntologiesPrefixes(List<String> mainOntologiesPrefixes) {
-		this.mainOntologiesPrefixes = mainOntologiesPrefixes;
+	public List<String> getMainOntologiesPrefixes() {
+		return mainOntologiesPrefixes;
 	}
 
 	public String getForceIriEncoding() {
 		return forceIriEncoding;
 	}
 
-	public void setForceIriEncoding(String forceIriEncoding) {
-		this.forceIriEncoding = forceIriEncoding;
+	public String getEndPointType() {
+		return endPointType;
+	}
+
+	public void setConfFile(String confFile) {
+		this.confFile = confFile;
 	}
 
 }