Skip to content

upgraded to 2401.7 #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

upgraded to 2401.7 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions apps/studio-client/apps/main/csv-studio-importer/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,22 @@
"version": "1.0.0-SNAPSHOT",
"private": true,
"dependencies": {
"@coremedia/studio-client.app-context-models": "2310.1.0",
"@coremedia/studio-client.cap-base-models": "2310.1.0",
"@coremedia/studio-client.client-core": "2310.1.0",
"@coremedia/studio-client.client-core-impl": "2310.1.0",
"@coremedia/studio-client.ext.ui-components": "2310.1.0",
"@coremedia/studio-client.main.editor-components": "2310.1.0",
"@jangaroo/ext-ts": "^1.0.3",
"@jangaroo/runtime": "^1.5.0"
"@coremedia/studio-client.app-context-models": "2401.7.0",
"@coremedia/studio-client.cap-base-models": "2401.7.0",
"@coremedia/studio-client.client-core": "2401.7.0",
"@coremedia/studio-client.client-core-impl": "2401.7.0",
"@coremedia/studio-client.ext.ui-components": "2401.7.0",
"@coremedia/studio-client.main.editor-components": "2401.7.0",
"@jangaroo/ext-ts": "^1.1.0",
"@jangaroo/runtime": "^2.0.0"
},
"devDependencies": {
"@jangaroo/build": "^1.5.0",
"@jangaroo/core": "^1.5.0",
"@jangaroo/eslint-config": "^1.5.0",
"@jangaroo/publish": "^1.5.0",
"eslint": "^7.32.0",
"@jangaroo/build": "^2.0.5",
"@jangaroo/core": "^2.0.5",
"@jangaroo/eslint-config": "^2.0.5",
"@jangaroo/joounit": "^2.0.5",
"@jangaroo/publish": "^2.0.5",
"eslint": "^8.56.0",
"rimraf": "^3.0.2"
},
"scripts": {
Expand Down
1 change: 0 additions & 1 deletion apps/studio-client/apps/main/csv-studio-importer/src/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"compilerOptions": {
"rootDir": ".",
"outDir": "../dist/src",
"moduleResolution": "nodenext",
"types": [
"@coremedia/studio-client.client-core",
"@coremedia/studio-client.main.editor-components",
Expand Down
4 changes: 4 additions & 0 deletions apps/studio-client/apps/main/csv-studio/jangaroo.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ module.exports = jangarooConfig({
mainClass: "com.coremedia.csv.studio.CSVExportStudioPlugin",
name: "CSV Exporter",
},
{
mainClass: "com.coremedia.csv.studio.CSVExportStudioPlugin",
name: "CSV Exporter2",
},
],
},
command: {
Expand Down
35 changes: 18 additions & 17 deletions apps/studio-client/apps/main/csv-studio/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,26 @@
"version": "1.0.0-SNAPSHOT",
"private": true,
"dependencies": {
"@coremedia/studio-client.cap-rest-client": "2310.1.0",
"@coremedia/studio-client.cap-rest-client-impl": "2310.1.0",
"@coremedia/studio-client.client-core": "2310.1.0",
"@coremedia/studio-client.client-core-impl": "2310.1.0",
"@coremedia/studio-client.ext.base-components": "2310.1.0",
"@coremedia/studio-client.ext.cap-base-components": "2310.1.0",
"@coremedia/studio-client.ext.ui-components": "2310.1.0",
"@coremedia/studio-client.main.editor-components": "2310.1.0",
"@coremedia/studio-client.ext.library-services-toolkit": "2310.1.0",
"@coremedia/studio-client.ext.toast-components": "2310.1.0",
"@jangaroo/ext-ts": "^1.0.3",
"@jangaroo/runtime": "^1.5.0"
"@coremedia/studio-client.cap-rest-client": "2401.7.0",
"@coremedia/studio-client.cap-rest-client-impl": "2401.7.0",
"@coremedia/studio-client.client-core": "2401.7.0",
"@coremedia/studio-client.client-core-impl": "2401.7.0",
"@coremedia/studio-client.ext.base-components": "2401.7.0",
"@coremedia/studio-client.ext.cap-base-components": "2401.7.0",
"@coremedia/studio-client.ext.ui-components": "2401.7.0",
"@coremedia/studio-client.main.editor-components": "2401.7.0",
"@coremedia/studio-client.ext.library-services-toolkit": "2401.7.0",
"@coremedia/studio-client.ext.toast-components": "2401.7.0",
"@jangaroo/ext-ts": "^1.1.0",
"@jangaroo/runtime": "^2.0.0"
},
"devDependencies": {
"@jangaroo/build": "^1.5.0",
"@jangaroo/core": "^1.5.0",
"@jangaroo/eslint-config": "^1.5.0",
"@jangaroo/publish": "^1.5.0",
"eslint": "^7.32.0",
"@jangaroo/build": "^2.0.5",
"@jangaroo/core": "^2.0.5",
"@jangaroo/eslint-config": "^2.0.5",
"@jangaroo/joounit": "^2.0.5",
"@jangaroo/publish": "^2.0.5",
"eslint": "^8.56.0",
"rimraf": "^3.0.2"
},
"scripts": {
Expand Down
1 change: 0 additions & 1 deletion apps/studio-client/apps/main/csv-studio/src/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"compilerOptions": {
"rootDir": ".",
"outDir": "../dist/src",
"moduleResolution": "nodenext",
"types": [
"@coremedia/studio-client.client-core",
"@coremedia/studio-client.main.editor-components",
Expand Down
5 changes: 3 additions & 2 deletions csv-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@
<groupId>com.coremedia.cms</groupId>
<artifactId>cap-unified-api</artifactId>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
</dependency>

</dependencies>
Expand Down
14 changes: 11 additions & 3 deletions csv-common/src/main/java/com/coremedia/csv/common/CSVConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import com.coremedia.cap.content.Content;
import com.coremedia.cap.content.ContentRepository;
import com.coremedia.cap.struct.Struct;
import org.springframework.beans.factory.annotation.Required;
import jakarta.annotation.PostConstruct;

import java.util.HashMap;
import java.util.List;
Expand Down Expand Up @@ -99,7 +99,6 @@ private Struct getReportingSettings(String templateName) {
*
* @param contentRepository the content repository to set
*/
@Required
public void setContentRepository(ContentRepository contentRepository) {
this.contentRepository = contentRepository;
}
Expand All @@ -109,8 +108,17 @@ public void setContentRepository(ContentRepository contentRepository) {
*
* @param settingsPath the settings path to set
*/
@Required
public void setSettingsPath(String settingsPath) {
this.settingsPath = settingsPath;
}

@PostConstruct
public void validateProperties() {
if (contentRepository == null) {
throw new IllegalStateException("Required property is not set: contentRepository");
}
if (settingsPath == null) {
throw new IllegalStateException("Required property is not set: settingsPath");
}
}
}
8 changes: 6 additions & 2 deletions csv-importer/src/main/java/com/coremedia/csv/importer/CSVUploader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,11 @@
import org.apache.commons.csv.CSVParser;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Required;
import jakarta.annotation.PostConstruct;

import edu.umd.cs.findbugs.annotations.NonNull;
import org.springframework.beans.factory.annotation.Autowired;

import java.io.*;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -284,7 +286,7 @@ public void runFromRequest(InputStream fileInputStream) {
*
* @param reportHeadersToContentProperties the map to set as the report headers to content properties map
*/
@Required
@Autowired
public void setReportHeadersToContentProperties(Map<String, String> reportHeadersToContentProperties) {
this.reportHeadersToContentProperties = reportHeadersToContentProperties;
}
Expand All @@ -294,6 +296,7 @@ public void setReportHeadersToContentProperties(Map<String, String> reportHeader
*
* @param authorizedGroups the authorized groups to set
*/
@Autowired
public void setAuthorizedGroups(List<String> authorizedGroups) {
this.authorizedGroups = authorizedGroups;
}
Expand All @@ -303,6 +306,7 @@ public void setAuthorizedGroups(List<String> authorizedGroups) {
*
* @param restrictToAuthorizedGroups the value to set
*/
@Autowired
public void setRestrictToAuthorizedGroups(boolean restrictToAuthorizedGroups) {
this.restrictToAuthorizedGroups = restrictToAuthorizedGroups;
}
Expand Down
10 changes: 10 additions & 0 deletions csv-preview-cae/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@
</properties>

<dependencies>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>5.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>contentbeans</artifactId>
Expand Down Expand Up @@ -74,6 +80,10 @@
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</dependency>
</dependencies>

</project>
6 changes: 3 additions & 3 deletions csv-preview-cae/src/main/java/com/coremedia/csv/cae/handlers/BaseCSVHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import com.coremedia.csv.common.CSVConfig;
import com.coremedia.csv.cae.utils.BaseCSVUtil;
import org.springframework.beans.factory.annotation.Required;
import org.springframework.beans.factory.annotation.Autowired;

/**
* Abstract handler that serves as a parent for all CSV file request handlers.
Expand All @@ -25,7 +25,7 @@ public abstract class BaseCSVHandler {
*
* @param CSVUtil the Utility class to set
*/
@Required
@Autowired
public void setCSVUtil(BaseCSVUtil CSVUtil) {
this.CSVUtil = CSVUtil;
}
Expand All @@ -35,7 +35,7 @@ public void setCSVUtil(BaseCSVUtil CSVUtil) {
*
* @param CSVConfig the CSVConfig to set
*/
@Required
@Autowired
public void setCSVConfig(CSVConfig CSVConfig) {
this.CSVConfig = CSVConfig;
}
Expand Down
9 changes: 7 additions & 2 deletions csv-preview-cae/src/main/java/com/coremedia/csv/cae/handlers/ContentSetCSVHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
package com.coremedia.csv.cae.handlers;

import com.coremedia.objectserver.web.links.Link;
import org.springframework.core.annotation.Order;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URLDecoder;

Expand Down Expand Up @@ -35,6 +36,7 @@ public class ContentSetCSVHandler extends BaseCSVHandler {
produces = "text/csv",
consumes = "application/json")
@ResponseBody
@Order(1)
public void handleRequest(@PathVariable("template") String template,
@RequestBody int[] contentIds,
HttpServletRequest request,
Expand All @@ -44,10 +46,13 @@ public void handleRequest(@PathVariable("template") String template,
CSVUtil.generateCSV(contentIds, templateName, true, request, response);
}



@PostMapping(value = CSV_LINK_NO_HEADER_PATTERN,
produces = "text/csv",
consumes = "application/json")
@ResponseBody
@Order(1)
public void handleRequestNoHeader(@PathVariable("template") String template,
@RequestBody int[] contentIds,
HttpServletRequest request,
Expand Down
21 changes: 10 additions & 11 deletions csv-preview-cae/src/main/java/com/coremedia/csv/cae/utils/BaseCSVUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,12 @@
import com.coremedia.xml.Markup;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Required;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.*;
import org.springframework.beans.factory.annotation.Autowired;

import static com.coremedia.csv.common.CSVConstants.*;

Expand Down Expand Up @@ -652,7 +651,7 @@ private void handleBadRecord(Content content, Map<String, String> csvRecord) {
*
* @param settingsService the settings service to set
*/
@Required
@Autowired
public void setSettingsService(SettingsService settingsService) {
this.settingsService = settingsService;
}
Expand All @@ -662,7 +661,7 @@ public void setSettingsService(SettingsService settingsService) {
*
* @param contentBeanFactory the content bean factory to set
*/
@Required
@Autowired
public void setContentBeanFactory(ContentBeanFactory contentBeanFactory) {
this.contentBeanFactory = contentBeanFactory;
}
Expand All @@ -672,7 +671,7 @@ public void setContentBeanFactory(ContentBeanFactory contentBeanFactory) {
*
* @param contentRepository the content repository to set
*/
@Required
@Autowired
public void setContentRepository(ContentRepository contentRepository) {
this.contentRepository = contentRepository;
}
Expand All @@ -682,7 +681,7 @@ public void setContentRepository(ContentRepository contentRepository) {
*
* @param linkFormatter the link formatter to set
*/
@Required
@Autowired
public void setLinkFormatter(LinkFormatter linkFormatter) {
this.linkFormatter = linkFormatter;
}
Expand All @@ -692,7 +691,7 @@ public void setLinkFormatter(LinkFormatter linkFormatter) {
*
* @param CSVConfig the CSVConfig to set
*/
@Required
@Autowired
public void setCSVConfig(CSVConfig CSVConfig) {
this.CSVConfig = CSVConfig;
}
Expand All @@ -702,7 +701,7 @@ public void setCSVConfig(CSVConfig CSVConfig) {
*
* @param filenamePrefix the file name prefix for generated files
*/
@Required
@Autowired
public void setFilenamePrefix(String filenamePrefix) {
this.filenamePrefix = filenamePrefix;
}
Expand All @@ -712,7 +711,7 @@ public void setFilenamePrefix(String filenamePrefix) {
*
* @param contentBatchPrefetchSize the batch size for fetching content
*/
@Required
@Autowired
public void setContentBatchPrefetchSize(int contentBatchPrefetchSize) {
this.contentBatchPrefetchSize = contentBatchPrefetchSize;
}
Expand Down
4 changes: 2 additions & 2 deletions ...eview-cae/src/main/java/com/coremedia/csv/cae/utils/CSVCaeCsrfIgnoringRequestMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

import com.coremedia.cae.security.CaeCsrfIgnoringRequestMatcher;

import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;

public class CSVCaeCsrfIgnoringRequestMatcher implements CaeCsrfIgnoringRequestMatcher {
@Override
public boolean matches(HttpServletRequest httpServletRequest) {
String requestUri = httpServletRequest.getRequestURI();
return requestUri != null && requestUri.contains("/contentsetexport");
return true;
}

}
4 changes: 2 additions & 2 deletions csv-studio-component/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@
<artifactId>jackson-annotations</artifactId>
</dependency>
<dependency>
<groupId>com.sun.activation</groupId>
<artifactId>jakarta.activation</artifactId>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
</dependency>
<dependency>
<groupId>com.github.spotbugs</groupId>
Expand Down
2 changes: 1 addition & 1 deletion csv-studio-component/src/main/java/com/coremedia/csv/studio/CSVExportJob.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import org.slf4j.LoggerFactory;
import com.fasterxml.jackson.annotation.JsonProperty;

import javax.activation.MimeTypeParseException;
import jakarta.activation.MimeTypeParseException;
import java.io.IOException;
import java.io.InputStream;
import java.util.*;
Expand Down
Loading