Skip to content
This repository has been archived by the owner on Jul 24, 2024. It is now read-only.

Commit

Permalink
AtlasMap is unable to find mapping #4846
Browse files Browse the repository at this point in the history
  • Loading branch information
lburgazzoli committed Mar 12, 2019
1 parent 8c36cb9 commit 61065ad
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,19 @@
*/
package io.syndesis.server.controller.integration.camelk;

import java.io.IOException;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Properties;
import java.util.Set;
import java.util.TreeSet;
import java.util.stream.Collectors;

import static java.nio.charset.StandardCharsets.UTF_8;

import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectWriter;
import io.fabric8.kubernetes.api.model.Secret;
Expand Down Expand Up @@ -55,19 +68,6 @@
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.stereotype.Component;

import java.io.IOException;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Properties;
import java.util.Set;
import java.util.TreeSet;
import java.util.stream.Collectors;

import static java.nio.charset.StandardCharsets.UTF_8;

@Component
@Qualifier("camel-k")
@ConditionalOnProperty(value = "controllers.integration", havingValue = "camel-k")
Expand Down Expand Up @@ -341,7 +341,7 @@ private void addMappingRules(Integration integration, ImmutableIntegrationSpec.B
builder.addResources(
new ResourceSpec.Builder()
.compression(compress)
.name(Names.sanitize(name))
.name(name)
.content(content)
.type("data")
.build()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

import java.util.Properties;

import com.jcabi.manifests.Manifests;
import io.fabric8.kubernetes.api.model.Secret;
import io.syndesis.common.model.action.ConnectorAction;
import io.syndesis.common.model.action.ConnectorDescriptor;
Expand All @@ -34,7 +33,6 @@
import io.syndesis.integration.project.generator.ProjectGeneratorConfiguration;
import io.syndesis.server.endpoint.v1.VersionService;
import io.syndesis.server.openshift.OpenShiftServiceNoOp;
import org.junit.BeforeClass;
import org.junit.Test;

import static org.assertj.core.api.Assertions.assertThat;
Expand Down Expand Up @@ -159,5 +157,6 @@ public void testCamelkIntegration() throws Exception {
assertThat(i.getSpec().getSources()).isNotEmpty();
assertThat(i.getSpec().getDependencies()).isNotEmpty();
assertThat(i.getSpec().getResources()).isNotEmpty();
assertThat(i.getSpec().getResources()).anyMatch(r -> "mapping-flow-0-step-1.json".equals(r.getName()));
}
}

0 comments on commit 61065ad

Please sign in to comment.