Skip to content

Commit 21698ae

Browse files
Updated samples to support redirecting from root context to comparison context and fix upload disabling functionality
1 parent 36430c6 commit 21698ae

20 files changed

Lines changed: 2527 additions & 2458 deletions

File tree

Demos/Dropwizard/client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"@angular/platform-browser": "^8.2.14",
3838
"@angular/platform-browser-dynamic": "^8.2.14",
3939
"@angular/router": "^8.2.14",
40-
"@groupdocs.examples.angular/comparison": "^0.8.80",
40+
"@groupdocs.examples.angular/comparison": "^0.8.82",
4141
"@nrwl/angular": "^8.8.2",
4242
"core-js": "^2.6.10",
4343
"rxjs": "~6.4.0",

Demos/Dropwizard/src/main/java/com/groupdocs/ui/common/MainService.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import com.groupdocs.ui.common.health.TemplateHealthCheck;
88
import com.groupdocs.ui.common.util.TempFilesManager;
99
import com.groupdocs.ui.comparison.resources.ComparisonResources;
10+
import com.groupdocs.ui.comparison.resources.RootResources;
1011
import io.dropwizard.Application;
1112
import io.dropwizard.assets.AssetsBundle;
1213
import io.dropwizard.configuration.EnvironmentVariableSubstitutor;
@@ -115,6 +116,7 @@ public void run(GlobalConfiguration globalConfiguration, Environment environment
115116
// Initiate resources (web pages)
116117
final ComparisonResources comparisonResources = new ComparisonResources(globalConfiguration);
117118
environment.jersey().register(comparisonResources);
119+
environment.jersey().register(new RootResources());
118120

119121
// Add custom exception mapper
120122
environment.jersey().register(new TotalGroupDocsExceptionMapper());
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package com.groupdocs.ui.comparison.resources;
2+
3+
import javax.servlet.ServletResponse;
4+
import javax.ws.rs.GET;
5+
import javax.ws.rs.Path;
6+
import javax.ws.rs.core.Response;
7+
import java.io.IOException;
8+
import java.net.URI;
9+
import java.net.URISyntaxException;
10+
11+
@Path(value = "/")
12+
public class RootResources {
13+
14+
@GET
15+
@Path(value = "/")
16+
public Response root(ServletResponse response) throws IOException, URISyntaxException {
17+
return Response.seeOther(new URI("/comparison")).build();
18+
}
19+
}

Demos/Dropwizard/src/main/java/com/groupdocs/ui/comparison/service/ComparisonServiceImpl.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,11 @@ public boolean checkFiles(CompareRequest compareRequest) {
306306
*/
307307
@Override
308308
public String uploadFile(InputStream inputStream, String fileName, boolean isRewrite) {
309+
final boolean isUploadEnabled = globalConfiguration.getCommon().isUpload();
310+
if (!isUploadEnabled) {
311+
throw new TotalGroupDocsException("Files uploading is disabled!");
312+
}
313+
309314
final FilesProvider filesProvider = FilesProvider.getInstance();
310315
final boolean isFileExists = filesProvider.isFileExists(fileName);
311316
if (!isFileExists || isRewrite) {

Demos/Dropwizard/src/main/resources/com/groupdocs/ui/comparison/views/comparison.ftl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<meta charset="utf-8"/>
66
<title>GroupDocs.Comparison for Java Dropwizard</title>
77
<base href="/"/>
8+
<link rel="shortcut icon" href="/assets/favicon.ico" />
89

910
<meta name="viewport" content="width=device-width, initial-scale=1"/>
1011
</head>

Demos/Ktor/src/main/kotlin/com/groupdocs/ui/Module.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import com.groupdocs.ui.modules.description.descriptionModule
66
import com.groupdocs.ui.modules.download.downloadModule
77
import com.groupdocs.ui.modules.home.homeModule
88
import com.groupdocs.ui.modules.page.pageModule
9+
import com.groupdocs.ui.modules.rootModule
910
import com.groupdocs.ui.modules.tree.treeModule
1011
import com.groupdocs.ui.modules.upload.uploadModule
1112
import com.groupdocs.ui.status.generalStatusPages
@@ -43,6 +44,7 @@ fun Application.module() {
4344
static("/static") {
4445
resources("static")
4546
}
47+
rootModule()
4648
route("/comparison") {
4749
homeModule()
4850
configModule()
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package com.groupdocs.ui.modules
2+
3+
import io.ktor.server.application.*
4+
import io.ktor.server.response.*
5+
import io.ktor.server.routing.*
6+
7+
8+
fun Routing.rootModule() {
9+
10+
get("/") {
11+
call.respondRedirect("/comparison")
12+
}
13+
}

Demos/Ktor/src/main/kotlin/com/groupdocs/ui/modules/upload/UploadModule.kt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.groupdocs.ui.modules.upload
22

3+
import com.groupdocs.ui.config.ComparerConfig
34
import com.groupdocs.ui.model.UploadResponse
45
import com.groupdocs.ui.status.InternalServerException
56
import io.ktor.http.*
@@ -14,8 +15,14 @@ import java.io.BufferedInputStream
1415

1516
fun Route.uploadModule() {
1617
val uploadController by inject<UploadController>()
18+
val comparerConfig by inject<ComparerConfig>()
1719

1820
post("/uploadDocument") {
21+
val isUploadEnabled = comparerConfig.common.upload
22+
if (!isUploadEnabled) {
23+
throw InternalServerException("Files uploading is disabled!")
24+
}
25+
1926
var url: String? = null
2027
var rewrite: Boolean = false
2128
var fileName: String? = null

Demos/Ktor/src/main/resources/static/main-es2015.js

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Demos/Ktor/src/main/resources/static/main-es5.js

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)