Skip to content

Commit

Permalink
Merge pull request #2252 from ControlSystemStudio/cf_unauthenticated_…
Browse files Browse the repository at this point in the history 
…client

Add a separate client for doing search without http auth header
  • Loading branch information
@shroffk
shroffk authored May 25, 2022
2 parents c3692db + 1d5013d commit 4a5268e
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 24 deletions.
54 changes: 31 additions & 23 deletions ...hannel/channelfinder/src/main/java/org/phoebus/channelfinder/ChannelFinderClientImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,17 @@
*
*/
public class ChannelFinderClientImpl implements ChannelFinderClient {
private final WebResource service;
private final WebResource cfAuthenticatedResource;
private final WebResource cfResource;

private final ExecutorService executor;

private static final String resourceChannels = "resources/channels";
private static final String resourceProperties = "resources/properties";
private static final String resourceTags = "resources/tags";


private static CFProperties properties = new CFProperties();
private static final Logger log = Logger.getLogger(ChannelFinderClient.class.getName());
/**
* A Builder class to help create the client to the Channelfinder Service
Expand Down Expand Up @@ -99,11 +103,10 @@ public static class CFCBuilder {

private ExecutorService executor = Executors.newSingleThreadExecutor();

private CFProperties properties = new CFProperties();

private CFCBuilder()
{
this.uri = URI.create(this.properties.getPreferenceValue("serviceURL"));
this.uri = URI.create(properties.getPreferenceValue("serviceURL"));
this.protocol = this.uri.getScheme();
}

Expand Down Expand Up @@ -261,19 +264,24 @@ public boolean verify(String hostname, SSLSession session) {
properties.getPreferenceValue("username"),
properties.getPreferenceValue("password"));
}

return new ChannelFinderClientImpl(this.uri, this.clientConfig, this.httpBasicAuthFilter, this.executor);
}
}

ChannelFinderClientImpl(URI uri, ClientConfig config, HTTPBasicAuthFilter httpBasicAuthFilter,
ExecutorService executor) {
Client client = Client.create(config);
client.setFollowRedirects(true);
cfResource = client.resource(uri.toString());
cfAuthenticatedResource = client.resource(uri.toString());
if (httpBasicAuthFilter != null) {
client.addFilter(httpBasicAuthFilter);
cfAuthenticatedResource.addFilter(httpBasicAuthFilter);
}
// TODO add a preference to add logging
if(Boolean.parseBoolean(properties.getPreferenceValue("rawFiltering"))) {
client.addFilter(new RawLoggingFilter(Logger.getLogger(RawLoggingFilter.class.getName())));
}
// client.addFilter(new RawLoggingFilter(Logger.getLogger(RawLoggingFilter.class.getName())));
client.setFollowRedirects(true);
service = client.resource(uri.toString());
this.executor = executor;
}

Expand All @@ -292,7 +300,7 @@ public Collection<String> call() throws Exception {
List<XmlProperty> xmlproperties = new ArrayList<XmlProperty>();
try {
xmlproperties = mapper.readValue(
service.path(resourceProperties).accept(MediaType.APPLICATION_JSON).get(String.class),
cfResource.path(resourceProperties).accept(MediaType.APPLICATION_JSON).get(String.class),
new TypeReference<List<XmlProperty>>() {
});
} catch (JsonParseException e) {
Expand Down Expand Up @@ -320,7 +328,7 @@ public List<Property> call() throws Exception {
List<XmlProperty> xmlproperties = new ArrayList<>();
try {
xmlproperties = mapper.readValue(
service.path(resourceProperties).accept(MediaType.APPLICATION_JSON).get(String.class),
cfResource.path(resourceProperties).accept(MediaType.APPLICATION_JSON).get(String.class),
new TypeReference<List<XmlProperty>>() {
});
} catch (Exception e) {
Expand All @@ -347,7 +355,7 @@ public Collection<String> call() {
List<XmlTag> xmltags = new ArrayList<XmlTag>();
try {
xmltags = mapper.readValue(
service.path(resourceTags)
cfResource.path(resourceTags)
.accept(MediaType.APPLICATION_JSON)
.get(String.class), new TypeReference<List<XmlTag>>() { });
} catch ( JsonParseException | JsonMappingException e) {
Expand Down Expand Up @@ -414,7 +422,7 @@ public Channel call() throws UniformInterfaceException
{
mapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true);
try {
return new Channel(mapper.readValue(service.path(resourceChannels).path(channelName)
return new Channel(mapper.readValue(cfResource.path(resourceChannels).path(channelName)
.get(ClientResponse.class).getEntityInputStream(), XmlChannel.class));
} catch (JsonParseException | JsonMappingException e) {
log.log(Level.WARNING, "Failed to process the list of channels", e);
Expand Down Expand Up @@ -451,7 +459,7 @@ public SetChannel(XmlChannel xmlChannel) {
public void run() {
ObjectMapper mapper = new ObjectMapper();
try {
service.path(resourceChannels).path(this.pxmlChannel.getName()).type(MediaType.APPLICATION_JSON)
cfAuthenticatedResource.path(resourceChannels).path(this.pxmlChannel.getName()).type(MediaType.APPLICATION_JSON)
.put(mapper.writeValueAsString(this.pxmlChannel));
} catch (JsonProcessingException e) {
log.log(Level.WARNING, "Failed to process the list of channel ", e);
Expand Down Expand Up @@ -486,7 +494,7 @@ public void run() {
mapper.writeValue(out, this.pxmlchannels);
final byte[] data = ((ByteArrayOutputStream) out).toByteArray();
String test = new String(data);
service.path(resourceChannels).type(MediaType.APPLICATION_JSON).put(test);
cfAuthenticatedResource.path(resourceChannels).type(MediaType.APPLICATION_JSON).put(test);
} catch (JsonParseException | JsonMappingException e) {
log.log(Level.WARNING, "Failed to process the list of channels ", e);
} catch ( IOException e) {
Expand Down Expand Up @@ -574,7 +582,7 @@ public SetTag(XmlTag xmlTag) {
public void run() {
ObjectMapper mapper = new ObjectMapper();
try {
service.path(resourceTags).path(this.pxmlTag.getName()).type(MediaType.APPLICATION_JSON)
cfAuthenticatedResource.path(resourceTags).path(this.pxmlTag.getName()).type(MediaType.APPLICATION_JSON)
.accept(MediaType.APPLICATION_JSON).put(mapper.writeValueAsString(this.pxmlTag));
} catch (JsonProcessingException e) {
log.log(Level.WARNING, "Failed to process the list of tags ", e);
Expand Down Expand Up @@ -671,7 +679,7 @@ private class SetProperty implements Runnable {
@Override
public void run() {
try {
service.path(resourceProperties).path(this.pxmlProperty.getName()).type(MediaType.APPLICATION_JSON)
cfAuthenticatedResource.path(resourceProperties).path(this.pxmlProperty.getName()).type(MediaType.APPLICATION_JSON)
.accept(MediaType.APPLICATION_JSON).put(mapper.writeValueAsString(this.pxmlProperty));
} catch (JsonProcessingException e) {
log.log(Level.WARNING, "Failed to process the list of properties ", e);
Expand Down Expand Up @@ -701,7 +709,7 @@ private class UpdateChannel implements Runnable {
@Override
public void run() {
try {
service.path(resourceChannels)
cfAuthenticatedResource.path(resourceChannels)
.path(this.channel.getName())
.type(MediaType.APPLICATION_JSON)
.post(mapper.writeValueAsString(this.channel));
Expand Down Expand Up @@ -770,7 +778,7 @@ private class UpdateTag implements Runnable {
@Override
public void run() {
try {
service.path(resourceTags).path(this.pxmlTag.getName()).type(MediaType.APPLICATION_JSON)
cfAuthenticatedResource.path(resourceTags).path(this.pxmlTag.getName()).type(MediaType.APPLICATION_JSON)
.post(mapper.writeValueAsString(this.pxmlTag));
} catch (UniformInterfaceException e) {
throw new ChannelFinderException(e);
Expand Down Expand Up @@ -814,7 +822,7 @@ private class UpdateChannelProperty implements Runnable {
@Override
public void run() {
try {
service.path(resourceProperties)
cfAuthenticatedResource.path(resourceProperties)
.path(this.pxmlProperty.getName())
.type(MediaType.APPLICATION_JSON)
.put(mapper.writeValueAsString(this.pxmlProperty));
Expand Down Expand Up @@ -885,7 +893,7 @@ private class UpdateProperty implements Runnable {
@Override
public void run() {
try {
service.path(resourceProperties).path(this.pxmlProperty.getName()).type(MediaType.APPLICATION_JSON)
cfAuthenticatedResource.path(resourceProperties).path(this.pxmlProperty.getName()).type(MediaType.APPLICATION_JSON)
.accept(MediaType.APPLICATION_JSON).post(mapper.writeValueAsString(this.pxmlProperty));
} catch (UniformInterfaceException e) {
throw new ChannelFinderException(e);
Expand Down Expand Up @@ -1035,7 +1043,7 @@ public Collection<Channel> call() throws Exception {
List<XmlChannel> xmlchannels = new ArrayList<XmlChannel>();
long start = System.currentTimeMillis();
try {
xmlchannels = mapper.readValue(service.path(resourceChannels).queryParams(this.map)
xmlchannels = mapper.readValue(cfResource.path(resourceChannels).queryParams(this.map)
.accept(MediaType.APPLICATION_JSON).get(String.class), new TypeReference<List<XmlChannel>>() {
});
} catch (Exception e) {
Expand Down Expand Up @@ -1142,7 +1150,7 @@ private class DeleteElement implements Runnable

@Override
public void run() {
service.path(elementType).path(elementName).delete();
cfAuthenticatedResource.path(elementType).path(elementName).delete();
}

}
Expand Down Expand Up @@ -1237,7 +1245,7 @@ private class DeleteElementfromChannel implements Runnable
@Override
public void run()
{
service.path(this.elementType).path(this.elementName).path(this.channelName)
cfAuthenticatedResource.path(this.elementType).path(this.elementName).path(this.channelName)
.accept(MediaType.APPLICATION_JSON).delete();
}

Expand Down Expand Up @@ -1300,7 +1308,7 @@ public Collection<Channel> getAllChannels()
List<XmlChannel> xmlchannels = new ArrayList<XmlChannel>();
try {
xmlchannels = mapper.readValue(
service.path(resourceChannels).accept(MediaType.APPLICATION_JSON).get(String.class),
cfAuthenticatedResource.path(resourceChannels).accept(MediaType.APPLICATION_JSON).get(String.class),
new TypeReference<List<XmlChannel>>() {
});
} catch (JsonParseException | JsonMappingException e) {
Expand Down
4 changes: 3 additions & 1 deletion app/channel/channelfinder/src/main/resources/channelfinder_preferences.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@

serviceURL=http://localhost:8080/ChannelFinder
username=admin
password=adminPass
password=adminPass

rawFiltering=false

0 comments on commit 4a5268e

Please sign in to comment.