Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
32 changes: 32 additions & 0 deletions gxspringboot/src/main/java/com/genexus/springboot/GXConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,16 @@
import com.genexus.diagnostics.core.LogManager;
import com.genexus.servlet.CorsFilter;
import com.genexus.xml.GXXMLSerializable;

import jakarta.annotation.PreDestroy;
import org.glassfish.jersey.server.ResourceConfig;
import org.glassfish.jersey.servlet.ServletContainer;
import org.glassfish.jersey.servlet.ServletProperties;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.Ordered;
import org.springframework.core.io.ClassPathResource;
import org.springframework.util.AntPathMatcher;
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
Expand All @@ -19,6 +24,10 @@
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.tuckey.web.filters.urlrewrite.UrlRewriteFilter;

import java.util.HashMap;
import java.util.Map;
import java.util.Set;

@Configuration
@EnableWebMvc
public class GXConfig implements WebMvcConfigurer {
Expand Down Expand Up @@ -82,6 +91,29 @@ public FilterRegistrationBean<UrlRewriteFilter> urlRewriteFilter() {
return registrationBean;
}

@Bean
public FilterRegistrationBean<ServletContainer> jerseyFilter() {
ResourceConfig rc = new ResourceConfig();
Set<Class<?>> rrcs = JaxrsResourcesHolder.getAll();
if (!rrcs.isEmpty()) {
rc.registerClasses(rrcs.toArray(new Class<?>[0]));
rc.property(ServletProperties.FILTER_FORWARD_ON_404, true);
}

ServletContainer container = new ServletContainer(rc);

FilterRegistrationBean<ServletContainer> reg = new FilterRegistrationBean<>(container);
reg.addUrlPatterns("/rest/*");
reg.setName("jersey-filter");
reg.setOrder(Ordered.HIGHEST_PRECEDENCE + 1);

Map<String, String> initParams = new HashMap<>();
initParams.put(ServletProperties.FILTER_CONTEXT_PATH, "/rest");
reg.setInitParameters(initParams);

return reg;
}

@PreDestroy
public void onDestroy() {
GXXMLSerializable.classesCacheMethods.clear();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Set;

import org.springframework.context.annotation.ImportSelector;
import org.springframework.core.io.ClassPathResource;
Expand All @@ -20,26 +22,28 @@ public class GXImportSelector implements ImportSelector {
@Override
public String[] selectImports(AnnotationMetadata importingClassMetadata) {
ArrayList<String> restImports = new ArrayList<>();
Set<Class<?>> rrcs = new HashSet<Class<?>>();
try {
Resource[] resources = new PathMatchingResourcePatternResolver().getResources("classpath*:*.services");
for (Resource resource : resources) {
selectImport(restImports, resource.getFilename());
selectImport(rrcs, restImports, resource.getFilename());
}
}
catch (IOException e){
logger.error("Error loading External Services classes ", e);
}

JaxrsResourcesHolder.setAll(rrcs);
addWebSocketsImport(restImports);

return restImports.toArray(new String[0]);
}

private void selectImport(ArrayList<String> restImports, String servicesClassesFileName) {
private void selectImport(Set<Class<?>> rrcs, ArrayList<String> restImports, String servicesClassesFileName) {
try {
InputStream is = new ClassPathResource(servicesClassesFileName).getInputStream();
if (is != null) {
WebUtils.AddExternalServicesFile(null, restImports, is);
WebUtils.AddExternalServicesFile(rrcs, restImports, is);

is.close();
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package com.genexus.springboot;

import java.util.LinkedHashSet;
import java.util.Set;

public final class JaxrsResourcesHolder {
private static final Set<Class<?>> RESOURCES = new LinkedHashSet<>();
private JaxrsResourcesHolder() {}

public static void setAll(Set<Class<?>> rrcs) {
RESOURCES.clear();
if (rrcs != null) RESOURCES.addAll(rrcs);
}

public static Set<Class<?>> getAll() {
return new LinkedHashSet<>(RESOURCES);
}
}

2 changes: 1 addition & 1 deletion java/src/main/java/com/genexus/webpanels/WebUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,7 @@ public static void AddExternalServicesFile(Set<Class<?>> rrcs, ArrayList<String>
if (serviceClass != null)
if (rrcs != null)
rrcs.add(serviceClass);
else
if (restImports != null)
restImports.add(serviceClass.getName());
}
reader.close();
Expand Down
Loading